summaryrefslogtreecommitdiffstats
path: root/src/engine/SCons/Tool/MSCommon
diff options
context:
space:
mode:
authorSye van der Veen <syeberman@rogers.com>2014-01-30 01:55:38 (GMT)
committerSye van der Veen <syeberman@rogers.com>2014-01-30 01:55:38 (GMT)
commit7d8383e96a0b591ec1865998bab2197cb2708616 (patch)
treec47b69f8dd37662a66bb4b1ca7480d49bb988250 /src/engine/SCons/Tool/MSCommon
parent864b97c8e206ac024eb3307ceaea5a5844e89971 (diff)
downloadSCons-7d8383e96a0b591ec1865998bab2197cb2708616.zip
SCons-7d8383e96a0b591ec1865998bab2197cb2708616.tar.gz
SCons-7d8383e96a0b591ec1865998bab2197cb2708616.tar.bz2
Fixed an error when trying to cross-compile from x86 to amd64 in MSVS: missing entry in the _HOST_TARGET_ARCH_TO_BAT_ARCH dict
Diffstat (limited to 'src/engine/SCons/Tool/MSCommon')
-rw-r--r--src/engine/SCons/Tool/MSCommon/vc.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/engine/SCons/Tool/MSCommon/vc.py b/src/engine/SCons/Tool/MSCommon/vc.py
index 09223e8..6a801ad 100644
--- a/src/engine/SCons/Tool/MSCommon/vc.py
+++ b/src/engine/SCons/Tool/MSCommon/vc.py
@@ -89,6 +89,7 @@ _ARCH_TO_CANONICAL = {
_HOST_TARGET_ARCH_TO_BAT_ARCH = {
("x86", "x86"): "x86",
("x86", "amd64"): "x86_amd64",
+ ("x86", "x86_amd64"): "x86_amd64",
("amd64", "x86_amd64"): "x86_amd64", # This is present in (at least) VS2012 express
("amd64", "amd64"): "amd64",
("amd64", "x86"): "x86",