diff options
| author | Gary Oberbrunner <garyo@oberbrunner.com> | 2012-08-01 01:56:31 (GMT) |
|---|---|---|
| committer | Gary Oberbrunner <garyo@oberbrunner.com> | 2012-08-01 01:56:31 (GMT) |
| commit | 0c1c87015c46287a1556b46032ce1d15440b338d (patch) | |
| tree | faf01c1efc97cecc5c1fbf32fedc0ba35dd53d6c | |
| parent | 4b14de8984c550a36d5f29011e7a8e037bef12f3 (diff) | |
| parent | 9c42343033219e14de1e45f064c4c5fba51b41c6 (diff) | |
| download | SCons-0c1c87015c46287a1556b46032ce1d15440b338d.zip SCons-0c1c87015c46287a1556b46032ce1d15440b338d.tar.gz SCons-0c1c87015c46287a1556b46032ce1d15440b338d.tar.bz2 | |
Merged in dubcanada/scons (pull request #28: Fix VC++ 32 vs 64 bit)
| -rw-r--r-- | src/engine/SCons/Tool/MSCommon/vc.py | 2 |
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..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 req_target_platform and target_platform=='amd64': + if not req_target_platform and target_platform in ('amd64','x86_64') try_target_archs.append('x86') d = None |