diff options
| author | Sye van der Veen <syeberman@rogers.com> | 2014-01-29 20:55:38 -0500 |
|---|---|---|
| committer | Sye van der Veen <syeberman@rogers.com> | 2014-01-29 20:55:38 -0500 |
| commit | 20c5ef029e0eb615dd3ce2ee17a844bd130ed7f2 (patch) | |
| tree | c47b69f8dd37662a66bb4b1ca7480d49bb988250 | |
| parent | 5080b23af741629ea97c04b34a7866db013018b2 (diff) | |
| download | scons-20c5ef029e0eb615dd3ce2ee17a844bd130ed7f2.tar.gz | |
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
| -rw-r--r-- | src/engine/SCons/Tool/MSCommon/vc.py | 1 |
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 09223e80..6a801ad1 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", |