summaryrefslogtreecommitdiffstats
path: root/src/engine/SCons/Tool/msvs.py
diff options
context:
space:
mode:
authorSteven Knight <knight@baldmt.com>2003-11-18 07:10:57 (GMT)
committerSteven Knight <knight@baldmt.com>2003-11-18 07:10:57 (GMT)
commitd0a974d767a1bb4a3947020c019d625a11e0af19 (patch)
tree2852b82f577251e2af04c8bb3a335b0ca467e3b5 /src/engine/SCons/Tool/msvs.py
parent921722a590e38747ab92e91f8d048b6a63345b9e (diff)
downloadSCons-d0a974d767a1bb4a3947020c019d625a11e0af19.zip
SCons-d0a974d767a1bb4a3947020c019d625a11e0af19.tar.gz
SCons-d0a974d767a1bb4a3947020c019d625a11e0af19.tar.bz2
Ensure that the ENV values are all strings. (Anthony Roach)
Diffstat (limited to 'src/engine/SCons/Tool/msvs.py')
-rw-r--r--src/engine/SCons/Tool/msvs.py10
1 files changed, 10 insertions, 0 deletions
diff --git a/src/engine/SCons/Tool/msvs.py b/src/engine/SCons/Tool/msvs.py
index 949793a..ee860e3 100644
--- a/src/engine/SCons/Tool/msvs.py
+++ b/src/engine/SCons/Tool/msvs.py
@@ -787,6 +787,16 @@ def get_visualstudio_versions():
if not L:
return []
+ # This is a hack to get around the fact that certain Visual Studio
+ # patches place a "6.1" version in the registry, which does not have
+ # any of the keys we need to find include paths, install directories,
+ # etc. Therefore we ignore it if it is there, since it throws all
+ # other logic off.
+ try:
+ L.remove("6.1")
+ except ValueError:
+ pass
+
L.sort()
L.reverse()