diff options
| author | William Deegan <bill@baddogconsulting.com> | 2017-08-24 00:00:35 (GMT) |
|---|---|---|
| committer | William Deegan <bill@baddogconsulting.com> | 2017-08-24 00:00:35 (GMT) |
| commit | cd59c53edd4e326279ddee934436a2aba055df5f (patch) | |
| tree | 3b5f303099832dbb03e6c0e32c605519e7d270dd | |
| parent | 939963642474e9f9b01adc6b42e5fda15de3fa89 (diff) | |
| parent | c1e58692726cbcc2dce29f69fa2f5cfa8d2c3422 (diff) | |
| download | SCons-cd59c53edd4e326279ddee934436a2aba055df5f.zip SCons-cd59c53edd4e326279ddee934436a2aba055df5f.tar.gz SCons-cd59c53edd4e326279ddee934436a2aba055df5f.tar.bz2 | |
Merged in grbd/scons (pull request #502)
Fix for building under python3.5 via bootstrap
| -rw-r--r-- | src/engine/SCons/Tool/MSCommon/vc.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/engine/SCons/Tool/MSCommon/vc.py b/src/engine/SCons/Tool/MSCommon/vc.py index 7c9eab5..53bd397 100644 --- a/src/engine/SCons/Tool/MSCommon/vc.py +++ b/src/engine/SCons/Tool/MSCommon/vc.py @@ -245,7 +245,9 @@ def find_vc_pdir_vswhere(msvc_version): if os.path.exists(vswhere_path): sp = subprocess.Popen(vswhere_cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE) vsdir, err = sp.communicate() - vc_pdir = os.path.join(vsdir.rstrip(), 'VC') + vsdir = vsdir.decode("mbcs") + vsdir = vsdir.rstrip() + vc_pdir = os.path.join(vsdir, 'VC') return vc_pdir else: # No vswhere on system, no install info available |