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

make sure -Wl,-Map is supported by the linker

Browse source 
mingw supports it, so only check for non-cross envs


git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@4590 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
kichik 2006-03-14 18:22:57 +00:00
parent ee3369307f
commit f36bb7557e
1 changed files with 12 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

16
SCons/Config/gnu
View file

@ -6,6 +6,10 @@ Import('defenv')
# http://sourceforge.net/tracker/?func=detail&aid=1313856&group_id=30337&atid=398973 # http://sourceforge.net/tracker/?func=detail&aid=1313856&group_id=30337&atid=398973
defenv['RCCOM'] = '$RC $_CPPDEFFLAGS $_CPPINCFLAGS ${INCPREFIX}${SOURCE.dir} $RCFLAGS -i $SOURCE -o $TARGET' defenv['RCCOM'] = '$RC $_CPPDEFFLAGS $_CPPINCFLAGS ${INCPREFIX}${SOURCE.dir} $RCFLAGS -i $SOURCE -o $TARGET'
### imports
Import('FlagsConfigure')
### cross compiling ### cross compiling
def cross_env(env): def cross_env(env):
@ -64,7 +68,10 @@ makensis_env.Append(CCFLAGS = '-Wall') # all warnings
if not defenv['DEBUG']: if not defenv['DEBUG']:
makensis_env.Append(LINKFLAGS = '-s') # strip makensis_env.Append(LINKFLAGS = '-s') # strip
makensis_env.Append(LINKFLAGS = '$MAP_FLAG') # generate map file
conf = FlagsConfigure(makensis_env)
conf.CheckLinkFlag('$MAP_FLAG') # generate map file
conf.Finish()
### plugin environment ### plugin environment
@ -91,7 +98,10 @@ cp_util_env.Append(CCFLAGS = '-Wall') # all warnings
if not defenv['DEBUG']: if not defenv['DEBUG']:
cp_util_env.Append(LINKFLAGS = '-s') # strip cp_util_env.Append(LINKFLAGS = '-s') # strip
cp_util_env.Append(LINKFLAGS = '$MAP_FLAG') # generate map file
conf = FlagsConfigure(cp_util_env)
conf.CheckLinkFlag('$MAP_FLAG') # generate map file
conf.Finish()
### util environment ### util environment
@ -190,8 +200,6 @@ conf.Finish()
# instead of -lpthread. # instead of -lpthread.
# #
Import('FlagsConfigure')
conf = FlagsConfigure(makensis_env) conf = FlagsConfigure(makensis_env)
conf.CheckLinkFlag('-pthread') conf.CheckLinkFlag('-pthread')
conf.Finish() conf.Finish()