MSVC fix for pre-2.3 Python versions. (Charles Crain)

git-svn-id: http://scons.tigris.org/svn/scons/trunk@854 fdb21ef1-2011-0410-befe-b5e4ea1792b1

diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index 8e1054a3678fe798189305c7a1be64406ae57292..c9a4ad6eb2094fadc8445546e4c29ef50efbe85c 100644 (file)
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -23,6 +23,8 @@ RELEASE 0.95 - XXX
   - Fix an incorrect _concat() call in the $RCINCFLAGS definition for
     the mingw Tool.
 
+  - Fix a problem with the msvc tool with Python versions prior to 2.3.
+
   From David M. Cooke:
 
   - Make the Fortran scanner case-insensitive for the INCLUDE string.

diff --git a/src/engine/SCons/Tool/msvc.py b/src/engine/SCons/Tool/msvc.py
index f7ec5e473b84d7c7dbafbafdf6f064a81f32d297..b9ce9bc53e0666dbc782e5bcc26a516fa4d802fb 100644 (file)
--- a/src/engine/SCons/Tool/msvc.py
+++ b/src/engine/SCons/Tool/msvc.py
@@ -133,7 +133,7 @@ def _get_msvc7_path(path, version, platform):
     # do weird things with the $(xxx)'s
     s = re.compile('\$\(([a-zA-Z0-9_]+?)\)')
 
-    def repl(match):
+    def repl(match, paths=paths):
         key = string.upper(match.group(1))
         if paths.has_key(key):
             return paths[key]