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

Auto-detection of 64 bit mingw-w64 on non-windows platforms (Patch #293)

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@7094 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
anders_k 2019-04-18 21:36:47 +00:00
parent ba5ca3a463
commit a81a90ec25
1 changed files with 9 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

10
SCons/Tools/crossmingw.py
View file

@ -43,7 +43,7 @@ import SCons.Tool
import SCons.Util
# This is what we search for to find mingw:
prefixes = SCons.Util.Split("""
prefixes32 = SCons.Util.Split("""
mingw32-
mingw32msvc-
i386-mingw32-
@ -64,10 +64,18 @@ prefixes = SCons.Util.Split("""
i686-w64-mingw32-
""")
prefixes64 = SCons.Util.Split("""
x86_64-w64-mingw32-
""")
def find(env):
# Explicitly specified toolchain to build Windows executables
# takes predominance.
prefix = SCons.Script.ARGUMENTS.get('XGCC_W32_PREFIX', None)
prefixes = prefixes32
if env['TARGET_ARCH'] == 'amd64':
prefixes = prefixes64
if prefix:
prefixes.insert(0, prefix)
for prefix in prefixes: