From f0c6ae7e6988933ba1a2f5eb778be3af5b3bfe49 Mon Sep 17 00:00:00 2001 From: stevenknight Date: Wed, 16 Feb 2005 23:28:56 +0000 Subject: [PATCH] Fix Intel compiler detection when there's no MSVC compiler installed. (Gary Oberbrunner) git-svn-id: http://scons.tigris.org/svn/scons/trunk@1234 fdb21ef1-2011-0410-befe-b5e4ea1792b1 --- src/engine/SCons/Tool/intelc.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/engine/SCons/Tool/intelc.py b/src/engine/SCons/Tool/intelc.py index da3b649a..88e38e18 100644 --- a/src/engine/SCons/Tool/intelc.py +++ b/src/engine/SCons/Tool/intelc.py @@ -128,10 +128,10 @@ def get_all_compiler_versions(): versions.sort(fltcmp) return versions -def get_intel_compiler_top(version=None, abi=None): +def get_intel_compiler_top(version, abi): """ Return the main path to the top-level dir of the Intel compiler, - using the given version or latest if None. + using the given version. The compiler will be in /bin/icl.exe (icc on linux), the include dir is /include, etc. """ @@ -275,15 +275,16 @@ def exists(env): return 0 try: - top = get_intel_compiler_top() + versions = get_all_compiler_versions() except (SCons.Util.RegError, IntelCError): - top = None - if not top: + versions = None + detected = versions is not None and len(versions) > 0 + if not detected: # try env.Detect, maybe that will work if is_win32: return env.Detect('icl') elif is_linux: return env.Detect('icc') - return top is not None + return detected # end of file -- 2.26.2