summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGary Oberbrunner <garyo@oberbrunner.com>2012-05-07 02:35:22 (GMT)
committerGary Oberbrunner <garyo@oberbrunner.com>2012-05-07 02:35:22 (GMT)
commitb1aa01e14e21176f0dd33919fae528e26280dec4 (patch)
treefe69ac5dfa2a68142e855ef61941bbe275772b6d /src
parentf69171690627bd16c8b1577731ca725fdbf50b69 (diff)
downloadSCons-b1aa01e14e21176f0dd33919fae528e26280dec4.zip
SCons-b1aa01e14e21176f0dd33919fae528e26280dec4.tar.gz
SCons-b1aa01e14e21176f0dd33919fae528e26280dec4.tar.bz2
MSVC: show valid $TARGET_ARCH values when invalid arch passed in.
Diffstat (limited to 'src')
-rw-r--r--src/CHANGES.txt4
-rw-r--r--src/engine/SCons/Tool/MSCommon/vc.py3
2 files changed, 6 insertions, 1 deletions
diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index 7747a3e..d1ae455 100644
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -6,6 +6,10 @@
RELEASE 2.X.X -
+ From Gary Oberbrunner:
+ - Show valid Visual Studio architectures in error message
+ when user passes invalid arch.
+
From Alexey Petruchik:
- Support for Microsoft Visual Studio 11 (both using it
and generating MSVS11 solution files).
diff --git a/src/engine/SCons/Tool/MSCommon/vc.py b/src/engine/SCons/Tool/MSCommon/vc.py
index 6647087..91cae1c 100644
--- a/src/engine/SCons/Tool/MSCommon/vc.py
+++ b/src/engine/SCons/Tool/MSCommon/vc.py
@@ -124,7 +124,8 @@ def get_host_target(env):
try:
target = _ARCH_TO_CANONICAL[target_platform.lower()]
except KeyError, e:
- raise ValueError("Unrecognized target architecture %s" % target_platform)
+ all_archs = str(_ARCH_TO_CANONICAL.keys())
+ raise ValueError("Unrecognized target architecture %s\n\tValid architectures: %s" % (target_platform, all_archs))
return (host, target,req_target_platform)