Make the linkloc tool use the value of to pick the version of MSVC. (Chris Pawling)

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

diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index cb61513c542651ab48c1ebc743fce4eaa9dce96c..dc1922b8002abaf9ad26268264faddc606935b4d 100644 (file)
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -89,6 +89,11 @@ RELEASE 0.97 - XXX
   - Print an internal Python stack trace in response to an otherwise
     unexplained error when --debug=stacktrace is specified.
 
+  From Chris Pawling:
+
+  - Have the linkloc tool use $MSVS_VERSION to select the Microsoft
+    Visual Studio version to use.
+
   From Kevin Quick:
 
   - Fix the Builder name returned from ListBuilders and other instances

diff --git a/src/engine/SCons/Tool/linkloc.py b/src/engine/SCons/Tool/linkloc.py
index a5b2bdda9b59d745e60a2b91ed37871676368820..3c25760ded1b1533509f7db5922e0b0155064c70 100644 (file)
--- a/src/engine/SCons/Tool/linkloc.py
+++ b/src/engine/SCons/Tool/linkloc.py
@@ -94,7 +94,7 @@ def generate(env):
     env['LIBLINKPREFIX']='-lib '
     env['LIBLINKSUFFIX']='$LIBSUFFIX'
 
-    include_path, lib_path, exe_path = get_msvc_paths()
+    include_path, lib_path, exe_path = get_msvc_paths(env['MSVS_VERSION'])
     env['ENV']['LIB']            = lib_path
     env['ENV']['PATH']           = exe_path