summaryrefslogtreecommitdiffstats
path: root/src/engine/SCons/Tool
diff options
context:
space:
mode:
authorSteven Knight <knight@baldmt.com>2004-12-02 04:29:30 (GMT)
committerSteven Knight <knight@baldmt.com>2004-12-02 04:29:30 (GMT)
commit2fa621343311180c159ee09262cefe0ee0ad2d83 (patch)
tree16de7183a1894d8d9e1dfe73cbcb354f472f5f85 /src/engine/SCons/Tool
parent04f1a4d2dd431f169a7aed2ae740c8cbd09e8d50 (diff)
downloadSCons-2fa621343311180c159ee09262cefe0ee0ad2d83.zip
SCons-2fa621343311180c159ee09262cefe0ee0ad2d83.tar.gz
SCons-2fa621343311180c159ee09262cefe0ee0ad2d83.tar.bz2
Scan SCons source code for uncaught KeyboardInterrupts. (Christoph Wiedemann)
Diffstat (limited to 'src/engine/SCons/Tool')
-rw-r--r--src/engine/SCons/Tool/intelc.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/engine/SCons/Tool/intelc.py b/src/engine/SCons/Tool/intelc.py
index ded33e9..454998a 100644
--- a/src/engine/SCons/Tool/intelc.py
+++ b/src/engine/SCons/Tool/intelc.py
@@ -189,10 +189,11 @@ def generate(env, version=None, abi=None, topdir=None, verbose=1):
for p in paths:
try:
path=get_intel_registry_value(p[1], version, abi)
+ except SCons.Errors.InternalError:
+ env.PrependENVPath(p[0], os.path.join(topdir, p[2]))
+ else:
env.PrependENVPath(p[0], ';'.split(path))
# print "ICL %s: %s, final=%s"%(p[0], path, str(env['ENV'][p[0]]))
- except:
- env.PrependENVPath(p[0], os.path.join(topdir, p[2]))
if is_win32:
env['CC'] = 'icl'