From 7d8383e96a0b591ec1865998bab2197cb2708616 Mon Sep 17 00:00:00 2001 From: Sye van der Veen Date: Wed, 29 Jan 2014 20:55:38 -0500 Subject: 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 --- src/engine/SCons/Tool/MSCommon/vc.py | 1 + 1 file changed, 1 insertion(+) 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", -- cgit v0.12