diff options
author | William Deegan <bill@baddogconsulting.com> | 2020-04-12 22:54:28 (GMT) |
---|---|---|
committer | William Deegan <bill@baddogconsulting.com> | 2020-04-12 22:54:28 (GMT) |
commit | 5c8ff63775a475510dc9fd555b99bdf0bf319d79 (patch) | |
tree | c152717f2e18b131afbc3b798e4ca6e179309e49 /src/engine/SCons | |
parent | afc8807fcc940e9b31043b1cdca68fd29c23719c (diff) | |
download | SCons-5c8ff63775a475510dc9fd555b99bdf0bf319d79.zip SCons-5c8ff63775a475510dc9fd555b99bdf0bf319d79.tar.gz SCons-5c8ff63775a475510dc9fd555b99bdf0bf319d79.tar.bz2 |
If no vswhere.exe is found, do not try to run it. Was breaking tests on non-win32
Diffstat (limited to 'src/engine/SCons')
-rw-r--r-- | src/engine/SCons/Tool/MSCommon/vc.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/engine/SCons/Tool/MSCommon/vc.py b/src/engine/SCons/Tool/MSCommon/vc.py index 456ccae..58be07c 100644 --- a/src/engine/SCons/Tool/MSCommon/vc.py +++ b/src/engine/SCons/Tool/MSCommon/vc.py @@ -366,6 +366,9 @@ def find_vc_pdir_vswhere(msvc_version, env=None): else: vswhere_path = env.subst('$VSWHERE') + if vswhere_path is None: + return None + debug('find_vc_pdir_vswhere(): VSWHERE = %s'%vswhere_path) vswhere_cmd = [ vswhere_path, @@ -374,6 +377,8 @@ def find_vc_pdir_vswhere(msvc_version, env=None): "-property", "installationPath", ] + debug("find_vc_pdir_vswhere(): running: %s" % vswhere_cmd) + #cp = subprocess.run(vswhere_cmd, capture_output=True) # 3.7+ only cp = subprocess.run(vswhere_cmd, stdout=PIPE, stderr=PIPE) |