diff options
| author | David Cournapeau <cournape@gmail.com> | 2009-11-19 04:56:16 (GMT) |
|---|---|---|
| committer | David Cournapeau <cournape@gmail.com> | 2009-11-19 04:56:16 (GMT) |
| commit | 67b21c8cb7dc3daa506bde8408653aec6f2298b7 (patch) | |
| tree | 62825c41be8633f70eb46b74b83bede290030c62 /src/engine/SCons/Tool/mslink.py | |
| parent | 7b9a5fe2840d22272d76cf4386ee56422148a04a (diff) | |
| download | SCons-67b21c8cb7dc3daa506bde8408653aec6f2298b7.zip SCons-67b21c8cb7dc3daa506bde8408653aec6f2298b7.tar.gz SCons-67b21c8cb7dc3daa506bde8408653aec6f2298b7.tar.bz2 | |
ENH: use msvc env, not msvs to set up mslib and mslink paths.
Diffstat (limited to 'src/engine/SCons/Tool/mslink.py')
| -rw-r--r-- | src/engine/SCons/Tool/mslink.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/engine/SCons/Tool/mslink.py b/src/engine/SCons/Tool/mslink.py index e2ff4ac..fda37bb 100644 --- a/src/engine/SCons/Tool/mslink.py +++ b/src/engine/SCons/Tool/mslink.py @@ -44,7 +44,7 @@ import SCons.Tool.msvc import SCons.Tool.msvs import SCons.Util -from MSCommon import merge_default_version, msvs_exists +from MSCommon import msvc_setup_env_once, msvs_exists def pdbGenerator(env, target, source, for_signature): try: @@ -238,8 +238,9 @@ def generate(env): env['REGSVRFLAGS'] = '/s ' env['REGSVRCOM'] = '$REGSVR $REGSVRFLAGS ${TARGET.windows}' - # Set-up ms tools paths for default version - merge_default_version(env) + # Set-up ms tools paths + msvc_setup_env_once(env) + # Loadable modules are on Windows the same as shared libraries, but they # are subject to different build parameters (LDMODULE* variables). |