diff options
| author | Gary Oberbrunner <garyo@oberbrunner.com> | 2009-05-22 17:46:18 (GMT) |
|---|---|---|
| committer | Gary Oberbrunner <garyo@oberbrunner.com> | 2009-05-22 17:46:18 (GMT) |
| commit | fe651b112c2182a058312b8803b86b99db59f8ff (patch) | |
| tree | 9795b753303368f040b655f784eb942bd9e04c27 | |
| parent | 57a356b8284d1b52bdd24009700ce90a7bf5593d (diff) | |
| download | SCons-fe651b112c2182a058312b8803b86b99db59f8ff.zip SCons-fe651b112c2182a058312b8803b86b99db59f8ff.tar.gz SCons-fe651b112c2182a058312b8803b86b99db59f8ff.tar.bz2 | |
Support Intel v11 compiler on Windows. Most of the code was already
fine; this just generalizes a check for whether it's really where the
registry says it is, to allow the new v11 location (Bin/<arch>/icl.exe).
| -rw-r--r-- | src/engine/SCons/Tool/intelc.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/engine/SCons/Tool/intelc.py b/src/engine/SCons/Tool/intelc.py index 202c2a4..2cd38bb 100644 --- a/src/engine/SCons/Tool/intelc.py +++ b/src/engine/SCons/Tool/intelc.py @@ -259,7 +259,9 @@ def get_intel_compiler_top(version, abi): if not SCons.Util.can_read_reg: raise NoRegistryModuleError, "No Windows registry module was found" top = get_intel_registry_value('ProductDir', version, abi) - if not os.path.exists(os.path.join(top, "Bin", "icl.exe")): + # pre-11, icl was in Bin. 11 and later, it's in Bin/<abi> apparently. + if not os.path.exists(os.path.join(top, "Bin", "icl.exe")) \ + and not os.path.exists(os.path.join(top, "Bin", abi, "icl.exe")): raise MissingDirError, \ "Can't find Intel compiler in %s"%(top) elif is_mac or is_linux: |