Gary Oberbrunner  committed 44c6c08 Merge

Merged in dirkbaechle/scons (pull request #106), fix misspelled variable in

  • Participants
  • Parent commits 0dcc6c9, 48333a5
  • Branches default

Comments (0)

Files changed (2)

File src/CHANGES.txt

       of large projects.
     - Fixed the handling of long options in the command-line
       parsing (#2929).
+    - Fixed misspelled variable in (#2928).
   From Gary Oberbrunner:
     - Test harness: fail_test() can now print a message to help debugging.

File src/engine/SCons/Tool/

                 for d in glob.glob('/opt/intel/composerxe-*'):
                     # Typical dir here is /opt/intel/composerxe-2011.4.184
                     m ='([0-9][0-9.]*)$', d)
-                    if m and == verison and \
+                    if m and == 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