summaryrefslogtreecommitdiffstats
path: root/src/engine
diff options
context:
space:
mode:
authorgrbd <garlicbready@googlemail.com>2017-08-15 12:07:54 (GMT)
committergrbd <garlicbready@googlemail.com>2017-08-15 12:07:54 (GMT)
commitc1e58692726cbcc2dce29f69fa2f5cfa8d2c3422 (patch)
treeefcb148e6afa1098db43abe255862f7779901865 /src/engine
parent8bfb071d974edae91cde09bd64f4a2b9673e1364 (diff)
downloadSCons-c1e58692726cbcc2dce29f69fa2f5cfa8d2c3422.zip
SCons-c1e58692726cbcc2dce29f69fa2f5cfa8d2c3422.tar.gz
SCons-c1e58692726cbcc2dce29f69fa2f5cfa8d2c3422.tar.bz2
Fix for building under python3.5 via bootstrap
Diffstat (limited to 'src/engine')
-rw-r--r--src/engine/SCons/Tool/MSCommon/vc.py4
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