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).

git-svn-id: http://scons.tigris.org/svn/scons/trunk@4211 fdb21ef1-2011-0410-befe-b5e4ea1792b1

diff --git a/src/engine/SCons/Tool/intelc.py b/src/engine/SCons/Tool/intelc.py
index 202c2a4b26c6e8df202093a1de0371d40ebaccad..2cd38bbf0f401434350fc3a5bca11918039adce0 100644 (file)
--- 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: