diff options
| author | William Deegan <bill@baddogconsulting.com> | 2017-08-07 22:10:06 (GMT) |
|---|---|---|
| committer | William Deegan <bill@baddogconsulting.com> | 2017-08-07 22:10:06 (GMT) |
| commit | bfebb4821ecd56a7fa99c9afe415d75bc1fa691f (patch) | |
| tree | 69cffcf73f5be6b5aeaab6bb4eb968f242c1c13c /src/engine/SCons/Tool/MSCommon/common.py | |
| parent | 07f6e06d93b212b5c6aaf40067405dcc4d426d76 (diff) | |
| download | SCons-bfebb4821ecd56a7fa99c9afe415d75bc1fa691f.zip SCons-bfebb4821ecd56a7fa99c9afe415d75bc1fa691f.tar.gz SCons-bfebb4821ecd56a7fa99c9afe415d75bc1fa691f.tar.bz2 | |
Pull Request contents P$ 489 from Steve Robinson. Manual edit/checkin because pull request was done to merge to 2.5.1 branch and not default.
Diffstat (limited to 'src/engine/SCons/Tool/MSCommon/common.py')
| -rw-r--r-- | src/engine/SCons/Tool/MSCommon/common.py | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/engine/SCons/Tool/MSCommon/common.py b/src/engine/SCons/Tool/MSCommon/common.py index a846cfc..b60cd5b 100644 --- a/src/engine/SCons/Tool/MSCommon/common.py +++ b/src/engine/SCons/Tool/MSCommon/common.py @@ -130,6 +130,13 @@ def normalize_env(env, keys, force=False): if sys32_dir not in normenv['PATH']: normenv['PATH'] = normenv['PATH'] + os.pathsep + sys32_dir + # Without Wbem in PATH, vcvarsall.bat has a "'wmic' is not recognized" + # error starting with Visual Studio 2017, although the script still + # seems to work anyway. + sys32_wbem_dir = os.path.join(sys32_dir, 'Wbem') + if sys32_wbem_dir not in normenv['PATH']: + normenv['PATH'] = normenv['PATH'] + os.pathsep + sys32_wbem_dir + debug("PATH: %s"%normenv['PATH']) return normenv |