diff options
| author | Steven Knight <knight@baldmt.com> | 2004-11-21 00:41:12 (GMT) |
|---|---|---|
| committer | Steven Knight <knight@baldmt.com> | 2004-11-21 00:41:12 (GMT) |
| commit | ffc625f8cf332399ba754bf2ebe9e700e5122eac (patch) | |
| tree | 9c21395a4d49fd3aba7a22fe8e93b041445b00b3 /src/engine/SCons/Tool/intelc.py | |
| parent | 376cfbfee0d52e867f2c6b955b6e218d788284ba (diff) | |
| download | SCons-ffc625f8cf332399ba754bf2ebe9e700e5122eac.zip SCons-ffc625f8cf332399ba754bf2ebe9e700e5122eac.tar.gz SCons-ffc625f8cf332399ba754bf2ebe9e700e5122eac.tar.bz2 | |
Miscellaneous fixes: portability and version fixes, missing , better CXXCOM tests, ATL include directories, intelc Tool import.
Diffstat (limited to 'src/engine/SCons/Tool/intelc.py')
| -rw-r--r-- | src/engine/SCons/Tool/intelc.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/engine/SCons/Tool/intelc.py b/src/engine/SCons/Tool/intelc.py index f979700..ded33e9 100644 --- a/src/engine/SCons/Tool/intelc.py +++ b/src/engine/SCons/Tool/intelc.py @@ -80,8 +80,11 @@ def get_all_compiler_versions(): versions=[] if is_win32: keyname = 'Software\\Intel\\Compilers\\C++' - k = SCons.Util.RegOpenKeyEx(SCons.Util.HKEY_LOCAL_MACHINE, - keyname) + try: + k = SCons.Util.RegOpenKeyEx(SCons.Util.HKEY_LOCAL_MACHINE, + keyname) + except WindowsError: + return [] i = 0 versions = [] try: @@ -158,7 +161,7 @@ def generate(env, version=None, abi=None, topdir=None, verbose=1): if abi is None: abi = "ia32" # or ia64, I believe - if topdir is None: + if topdir is None and version: try: topdir = get_intel_compiler_top(version, abi) except (SCons.Util.RegError, SCons.Errors.InternalError): |