diff options
| author | Steven Knight <knight@baldmt.com> | 2004-09-22 02:29:27 (GMT) |
|---|---|---|
| committer | Steven Knight <knight@baldmt.com> | 2004-09-22 02:29:27 (GMT) |
| commit | ac6bb67fcd7462ba39dc5b7be07cef6f3424933c (patch) | |
| tree | 03774eb0b26baefcd560a2a1d5cd41c463712afc | |
| parent | befcea7d50fb04ebc45e76f577635b28f7e0f0ca (diff) | |
| download | SCons-ac6bb67fcd7462ba39dc5b7be07cef6f3424933c.zip SCons-ac6bb67fcd7462ba39dc5b7be07cef6f3424933c.tar.gz SCons-ac6bb67fcd7462ba39dc5b7be07cef6f3424933c.tar.bz2 | |
Make the linkloc tool use the value of to pick the version of MSVC. (Chris Pawling)
| -rw-r--r-- | src/CHANGES.txt | 5 | ||||
| -rw-r--r-- | src/engine/SCons/Tool/linkloc.py | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/CHANGES.txt b/src/CHANGES.txt index cb61513..dc1922b 100644 --- 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 a5b2bdd..3c25760 100644 --- 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 |