summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGary Oberbrunner <garyo@oberbrunner.com>2014-01-03 14:42:07 -0500
committerGary Oberbrunner <garyo@oberbrunner.com>2014-01-03 14:42:07 -0500
commit093702c094cb6b5dcfc1e904d49beaacc83ab7be (patch)
tree6924db9b3a6121f91d6ee5e615cfd97d9d5e3895
parent8985f392bf5429d648345112d5225d4ac6dc9e7a (diff)
downloadscons-093702c094cb6b5dcfc1e904d49beaacc83ab7be.tar.gz
Fix Intel compiler setup on Windows (it still needs VS1x0COMNTOOLS)
-rw-r--r--src/engine/SCons/Tool/MSCommon/common.py8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/engine/SCons/Tool/MSCommon/common.py b/src/engine/SCons/Tool/MSCommon/common.py
index caf2b379..ccfe7396 100644
--- a/src/engine/SCons/Tool/MSCommon/common.py
+++ b/src/engine/SCons/Tool/MSCommon/common.py
@@ -146,9 +146,11 @@ def get_output(vcbat, args = None, env = None):
# settings in vs.py.
vars = [
'COMSPEC',
-# Still set, but setup script will discard these if registry has values.
-# 'VS110COMNTOOLS',
-# 'VS100COMNTOOLS',
+# VS100 and VS110: Still set, but modern MSVC setup scripts will
+# discard these if registry has values. However Intel compiler setup
+# script still requires these as of 2013/2014.
+ 'VS110COMNTOOLS',
+ 'VS100COMNTOOLS',
'VS90COMNTOOLS',
'VS80COMNTOOLS',
'VS71COMNTOOLS',