fix: use right compiler for x86 target on VS2010 under Windows 64 bits
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6201 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
parent
0792c8a81f
commit
b1c298f815
1 changed files with 4 additions and 4 deletions
|
@ -68,14 +68,14 @@ path = ARGUMENTS.get('PATH', '')
|
||||||
toolset = ARGUMENTS.get('TOOLSET', '')
|
toolset = ARGUMENTS.get('TOOLSET', '')
|
||||||
|
|
||||||
if toolset and path:
|
if toolset and path:
|
||||||
defenv = Environment(ENV = {'PATH' : path}, TOOLS = toolset.split(',') + ['zip'])
|
defenv = Environment(TARGET_ARCH = 'x86', ENV = {'PATH' : path}, TOOLS = toolset.split(',') + ['zip'])
|
||||||
else:
|
else:
|
||||||
if path:
|
if path:
|
||||||
defenv = Environment(ENV = {'PATH' : path})
|
defenv = Environment(TARGET_ARCH = 'x86', ENV = {'PATH' : path})
|
||||||
if toolset:
|
if toolset:
|
||||||
defenv = Environment(TOOLS = toolset.split(',') + ['zip'])
|
defenv = Environment(TARGET_ARCH = 'x86', TOOLS = toolset.split(',') + ['zip'])
|
||||||
if not toolset and not path:
|
if not toolset and not path:
|
||||||
defenv = Environment()
|
defenv = Environment(TARGET_ARCH = 'x86')
|
||||||
|
|
||||||
Export('defenv')
|
Export('defenv')
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue