From ca46490ad22862407741f3bf770cac2188313381 Mon Sep 17 00:00:00 2001 From: Steven Verbeek Date: Wed, 4 Jul 2012 22:30:38 -0300 Subject: Fixes an issue with 64 bit Windows 7 running 32 bit Visual Express C++ 2010 bug: http://scons.tigris.org/issues/show_bug.cgi?id=2849 --- src/engine/SCons/Tool/MSCommon/vc.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/engine/SCons/Tool/MSCommon/vc.py b/src/engine/SCons/Tool/MSCommon/vc.py index 91cae1c..178f5df 100644 --- a/src/engine/SCons/Tool/MSCommon/vc.py +++ b/src/engine/SCons/Tool/MSCommon/vc.py @@ -361,7 +361,7 @@ def msvc_find_valid_batch_script(env,version): # The TARGET_ARCH is amd64 then also try 32 bits if there are no viable # 64 bit tools installed try_target_archs = [target_platform] - if not req_target_platform and target_platform=='amd64': + if target_platform in ('amd64','x86_64') try_target_archs.append('x86') d = None -- cgit v0.12 From 820e9abd1a7ccdb415d3f05f8a88e3d16c0e7abf Mon Sep 17 00:00:00 2001 From: Steven Verbeek Date: Tue, 17 Jul 2012 23:35:27 -0300 Subject: Changed to proper method --- src/engine/SCons/Tool/MSCommon/vc.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/engine/SCons/Tool/MSCommon/vc.py b/src/engine/SCons/Tool/MSCommon/vc.py index 178f5df..7bc0bba 100644 --- a/src/engine/SCons/Tool/MSCommon/vc.py +++ b/src/engine/SCons/Tool/MSCommon/vc.py @@ -361,7 +361,7 @@ def msvc_find_valid_batch_script(env,version): # The TARGET_ARCH is amd64 then also try 32 bits if there are no viable # 64 bit tools installed try_target_archs = [target_platform] - if target_platform in ('amd64','x86_64') + if not target_platform and target_platform in ('amd64','x86_64') try_target_archs.append('x86') d = None -- cgit v0.12 From 9c42343033219e14de1e45f064c4c5fba51b41c6 Mon Sep 17 00:00:00 2001 From: Steven Verbeek Date: Tue, 17 Jul 2012 23:36:36 -0300 Subject: Forgot the req_ --- src/engine/SCons/Tool/MSCommon/vc.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/engine/SCons/Tool/MSCommon/vc.py b/src/engine/SCons/Tool/MSCommon/vc.py index 7bc0bba..2ddb910 100644 --- a/src/engine/SCons/Tool/MSCommon/vc.py +++ b/src/engine/SCons/Tool/MSCommon/vc.py @@ -361,7 +361,7 @@ def msvc_find_valid_batch_script(env,version): # The TARGET_ARCH is amd64 then also try 32 bits if there are no viable # 64 bit tools installed try_target_archs = [target_platform] - if not target_platform and target_platform in ('amd64','x86_64') + if not req_target_platform and target_platform in ('amd64','x86_64') try_target_archs.append('x86') d = None -- cgit v0.12