From fe651b112c2182a058312b8803b86b99db59f8ff Mon Sep 17 00:00:00 2001 From: Gary Oberbrunner Date: Fri, 22 May 2009 17:46:18 +0000 Subject: 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//icl.exe). --- src/engine/SCons/Tool/intelc.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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/ 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: -- cgit v0.12