summaryrefslogtreecommitdiffstats
path: root/src/engine/SCons/Tool/msvc.py
diff options
context:
space:
mode:
authorSteven Knight <knight@baldmt.com>2004-05-08 23:00:41 (GMT)
committerSteven Knight <knight@baldmt.com>2004-05-08 23:00:41 (GMT)
commit4ef08f4ff1914f6a8cf79fde2c105753885a8bfd (patch)
treec5dabe3f08e703324e118b91017875b6c22d4168 /src/engine/SCons/Tool/msvc.py
parentf424fc07e9aed44d3f5df0a14d4b44081c806ff1 (diff)
downloadSCons-4ef08f4ff1914f6a8cf79fde2c105753885a8bfd.zip
SCons-4ef08f4ff1914f6a8cf79fde2c105753885a8bfd.tar.gz
SCons-4ef08f4ff1914f6a8cf79fde2c105753885a8bfd.tar.bz2
Better midl (Visual Studio MIDL compiler) Tool detection. (Anthony Roach)
Diffstat (limited to 'src/engine/SCons/Tool/msvc.py')
-rw-r--r--src/engine/SCons/Tool/msvc.py12
1 files changed, 4 insertions, 8 deletions
diff --git a/src/engine/SCons/Tool/msvc.py b/src/engine/SCons/Tool/msvc.py
index 1caa4db..3d49802 100644
--- a/src/engine/SCons/Tool/msvc.py
+++ b/src/engine/SCons/Tool/msvc.py
@@ -478,13 +478,9 @@ def generate(env):
env['BUILDERS']['PCH'] = pch_builder
def exists(env):
- try:
- v = SCons.Tool.msvs.get_visualstudio_versions()
- except (SCons.Util.RegError, SCons.Errors.InternalError):
- pass
-
- if not v:
- return env.Detect('cl')
- else:
+ if SCons.Tool.msvs.is_msvs_installed():
# there's at least one version of MSVS installed.
return 1
+ else:
+ return env.Detect('cl')
+