summaryrefslogtreecommitdiffstats
path: root/src/engine/SCons/Tool/MSCommon
diff options
context:
space:
mode:
authorSteven Verbeek <dubcanada@gmail.com>2012-07-05 01:30:38 (GMT)
committerSteven Verbeek <dubcanada@gmail.com>2012-07-05 01:30:38 (GMT)
commitca46490ad22862407741f3bf770cac2188313381 (patch)
tree5547afb3e721d5c4cefd1167dfdfafa6abb537db /src/engine/SCons/Tool/MSCommon
parente237baf3f6879945943caf19ff13c15ebcc46434 (diff)
downloadSCons-ca46490ad22862407741f3bf770cac2188313381.zip
SCons-ca46490ad22862407741f3bf770cac2188313381.tar.gz
SCons-ca46490ad22862407741f3bf770cac2188313381.tar.bz2
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
Diffstat (limited to 'src/engine/SCons/Tool/MSCommon')
-rw-r--r--src/engine/SCons/Tool/MSCommon/vc.py2
1 files changed, 1 insertions, 1 deletions
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