summaryrefslogtreecommitdiffstats
path: root/src/engine/SCons/Tool/MSCommon
diff options
context:
space:
mode:
authorGary Oberbrunner <garyo@oberbrunner.com>2014-01-03 19:42:07 (GMT)
committerGary Oberbrunner <garyo@oberbrunner.com>2014-01-03 19:42:07 (GMT)
commit8a2bb84c2c11449ec5a9e49fc4e9777655978854 (patch)
tree6924db9b3a6121f91d6ee5e615cfd97d9d5e3895 /src/engine/SCons/Tool/MSCommon
parentb98a3cb4f2a408de1cf112bd956d427412fc319e (diff)
downloadSCons-8a2bb84c2c11449ec5a9e49fc4e9777655978854.zip
SCons-8a2bb84c2c11449ec5a9e49fc4e9777655978854.tar.gz
SCons-8a2bb84c2c11449ec5a9e49fc4e9777655978854.tar.bz2
Fix Intel compiler setup on Windows (it still needs VS1x0COMNTOOLS)
Diffstat (limited to 'src/engine/SCons/Tool/MSCommon')
-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 caf2b37..ccfe739 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',