diff options
| author | Gary Oberbrunner <garyo@oberbrunner.com> | 2014-03-02 00:39:19 (GMT) |
|---|---|---|
| committer | Gary Oberbrunner <garyo@oberbrunner.com> | 2014-03-02 00:39:19 (GMT) |
| commit | 30b007a681ebd75c9177544ee6ada642c58489aa (patch) | |
| tree | eb1d7f5fff7ffefa5f730505ec10d939ca4f7e74 | |
| parent | db488b77880b062b1875c22b9a226f09c4330808 (diff) | |
| parent | 94cc088734ad1ae2b100ca77e3abfac6741dfc53 (diff) | |
| download | SCons-30b007a681ebd75c9177544ee6ada642c58489aa.zip SCons-30b007a681ebd75c9177544ee6ada642c58489aa.tar.gz SCons-30b007a681ebd75c9177544ee6ada642c58489aa.tar.bz2 | |
Merged in dirkbaechle/scons (pull request #106), fix misspelled variable in intelc.py.
| -rw-r--r-- | src/CHANGES.txt | 1 | ||||
| -rw-r--r-- | src/engine/SCons/Tool/intelc.py | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/CHANGES.txt b/src/CHANGES.txt index 39c8d32..77fcf40 100644 --- a/src/CHANGES.txt +++ b/src/CHANGES.txt @@ -51,6 +51,7 @@ RELEASE 2.3.1.alpha.yyyymmdd - NEW DATE WILL BE INSERTED HERE of large projects. - Fixed the handling of long options in the command-line parsing (#2929). + - Fixed misspelled variable in intelc.py (#2928). From Gary Oberbrunner: - Test harness: fail_test() can now print a message to help debugging. diff --git a/src/engine/SCons/Tool/intelc.py b/src/engine/SCons/Tool/intelc.py index 4201092..42f8e74 100644 --- a/src/engine/SCons/Tool/intelc.py +++ b/src/engine/SCons/Tool/intelc.py @@ -317,7 +317,7 @@ def get_intel_compiler_top(version, abi): for d in glob.glob('/opt/intel/composerxe-*'): # Typical dir here is /opt/intel/composerxe-2011.4.184 m = re.search(r'([0-9][0-9.]*)$', d) - if m and m.group(1) == verison and \ + if m and m.group(1) == version and \ (os.path.exists(os.path.join(d, "bin", "ia32", "icc")) or os.path.exists(os.path.join(d, "bin", "intel64", "icc"))): top = d |