summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDirk Baechle <dl9obn@darc.de>2014-02-01 16:02:27 (GMT)
committerDirk Baechle <dl9obn@darc.de>2014-02-01 16:02:27 (GMT)
commit94cc088734ad1ae2b100ca77e3abfac6741dfc53 (patch)
tree84091250956de4d77b2b5115e064ecf1249d9e0d
parent396cc5ff8cce251f405e3eba6163362239ce7d08 (diff)
downloadSCons-94cc088734ad1ae2b100ca77e3abfac6741dfc53.zip
SCons-94cc088734ad1ae2b100ca77e3abfac6741dfc53.tar.gz
SCons-94cc088734ad1ae2b100ca77e3abfac6741dfc53.tar.bz2
- fix for #2928 (misspelled variable in intelc.py)
-rw-r--r--src/CHANGES.txt1
-rw-r--r--src/engine/SCons/Tool/intelc.py2
2 files changed, 2 insertions, 1 deletions
diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index 8b24696..0852fe9 100644
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -43,6 +43,7 @@ RELEASE 2.3.1.alpha.yyyymmdd - NEW DATE WILL BE INSERTED HERE
SCons from a source (non-installed) dir.
- Count statistics of instances are now collected only when
the --debug=count command-line option is used (#2922).
+ - 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