diff options
| author | William Deegan <bill@baddogconsulting.com> | 2019-06-20 01:08:45 (GMT) |
|---|---|---|
| committer | William Deegan <bill@baddogconsulting.com> | 2019-06-20 01:08:45 (GMT) |
| commit | c325fae0a27d23b292852d18f8b9b0e649cd5cf0 (patch) | |
| tree | 6b2bc3d37d158a75fda0a0003ec2aa10059af08d /src | |
| parent | 097b3932eaa083c9f446eab4d8c3ebac09f0aa24 (diff) | |
| download | SCons-c325fae0a27d23b292852d18f8b9b0e649cd5cf0.zip SCons-c325fae0a27d23b292852d18f8b9b0e649cd5cf0.tar.gz SCons-c325fae0a27d23b292852d18f8b9b0e649cd5cf0.tar.bz2 | |
Allow MSVCUnsupportedTargetArch and MSVCUnsupportedHostArch exceptions to propagate and cause SCons to exit
Diffstat (limited to 'src')
| -rw-r--r-- | src/engine/SCons/Tool/MSCommon/common.py | 1 | ||||
| -rw-r--r-- | src/engine/SCons/Tool/MSCommon/vc.py | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/engine/SCons/Tool/MSCommon/common.py b/src/engine/SCons/Tool/MSCommon/common.py index d8cb20f..c3ba8e5 100644 --- a/src/engine/SCons/Tool/MSCommon/common.py +++ b/src/engine/SCons/Tool/MSCommon/common.py @@ -34,7 +34,6 @@ import re import SCons.Util - LOGFILE = os.environ.get('SCONS_MSCOMMON_DEBUG') if LOGFILE == '-': def debug(message): diff --git a/src/engine/SCons/Tool/MSCommon/vc.py b/src/engine/SCons/Tool/MSCommon/vc.py index b3ba0b8..1da2643 100644 --- a/src/engine/SCons/Tool/MSCommon/vc.py +++ b/src/engine/SCons/Tool/MSCommon/vc.py @@ -562,6 +562,10 @@ def get_installed_vcs(env=None): debug('find_vc_pdir no compiler found %s' % ver) else: debug('find_vc_pdir return None for ver %s' % ver) + except (MSVCUnsupportedTargetArch, MSVCUnsupportedHostArch) as e: + # Allow this exception to propagate further as it should cause + # SCons to exit with an error code + raise except VisualCException as e: debug('did not find VC %s: caught exception %s' % (ver, str(e))) return installed_versions |