From 8a2bb84c2c11449ec5a9e49fc4e9777655978854 Mon Sep 17 00:00:00 2001 From: Gary Oberbrunner Date: Fri, 3 Jan 2014 14:42:07 -0500 Subject: Fix Intel compiler setup on Windows (it still needs VS1x0COMNTOOLS) --- src/engine/SCons/Tool/MSCommon/common.py | 8 +++++--- 1 file 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', -- cgit v0.12