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/mslib.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/mslib.py')
| -rw-r--r-- | src/engine/SCons/Tool/mslib.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/engine/SCons/Tool/mslib.py b/src/engine/SCons/Tool/mslib.py index 9d0fcef..2e8425e 100644 --- a/src/engine/SCons/Tool/mslib.py +++ b/src/engine/SCons/Tool/mslib.py @@ -39,14 +39,14 @@ import SCons.Tool.msvs import SCons.Tool.msvc import SCons.Util -from MSCommon import msvs_exists, merge_default_version +from MSCommon import msvs_exists, msvc_setup_env_once def generate(env): """Add Builders and construction variables for lib to an Environment.""" SCons.Tool.createStaticLibBuilder(env) - # Set-up ms tools paths for default version - merge_default_version(env) + # Set-up ms tools paths + msvc_setup_env_once(env) env['AR'] = 'lib' env['ARFLAGS'] = SCons.Util.CLVar('/nologo') |