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

mstoolkit toolchain should use the VC toolkit linker by default. link.exe can even stand in for lib.exe if required

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6504 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
anders_k 2014-06-23 19:15:59 +00:00
parent 59e19c8c94
commit d43e3a717c
4 changed files with 22 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Contrib/System/SConscript
View file

@ -38,10 +38,15 @@ if env['TARGET_ARCH'] != 'amd64' or msvc: # BUGBUG: Call-amd64.S is missing GAS
defs += ['SYSTEM_PARTIALCALLSUPPORT']
filename = 'Call' + srcsuff
# When using the MS toolchain, SCons can pass .sx files to cl.exe:
# "D4024 : unrecognized source file type 'file.sx', object file assumed"
# "D4027 : source file 'file.sx' ignored"
# ...and then it returns 0!
# This only happens if TryCompile .S fails (ML/ML64 not in %PATH%?)
conf = env.Configure()
if conf.TryCompile('END', '.S'):
files += ['Source/'+filename+'.S']
elif conf.TryCompile('.end', '.sx'):
elif (not msvc) and conf.TryCompile('.end', '.sx'):
files += ['Source/'+filename+'.sx']
else:
print 'WARNING: System.dll: unable to find assembler for '+filename+'.S'