dragonleo/NSIS
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix FTBFS on Debian GNU/Linux amd64 due to not enough use of -m32

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@5565 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
pabs3 2008-03-03 16:33:56 +00:00
parent 98909c6884
commit 8666849f94
1 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

8
SCons/Config/gnu
View file

@ -134,9 +134,11 @@ if not defenv['DEBUG'] and defenv['STRIP'] and defenv['STRIP_W32']:
util_env.Append(LINKFLAGS = '-s') # strip util_env.Append(LINKFLAGS = '-s') # strip
conf.Finish() conf.Finish()
### cross-platform util environment stripping ### cross-platform util environment adjustments
conf = FlagsConfigure(cp_util_env) conf = FlagsConfigure(cp_util_env)
conf.CheckCompileFlag('-m32')
conf.CheckLinkFlag('-m32')
if not defenv['DEBUG'] and defenv['STRIP'] and defenv['STRIP_CP']: if not defenv['DEBUG'] and defenv['STRIP'] and defenv['STRIP_CP']:
TestStrip(conf) # strip TestStrip(conf) # strip
conf.Finish() conf.Finish()
@ -144,6 +146,10 @@ conf.Finish()
### test environment ### test environment
test_env = defenv.Clone() test_env = defenv.Clone()
conf = FlagsConfigure(test_env)
conf.CheckCompileFlag('-m32')
conf.CheckLinkFlag('-m32')
conf.Finish()
### weird GCC requirements ### weird GCC requirements