diff options
| author | Steven Knight <knight@baldmt.com> | 2004-02-26 05:56:51 (GMT) |
|---|---|---|
| committer | Steven Knight <knight@baldmt.com> | 2004-02-26 05:56:51 (GMT) |
| commit | dfa9ded59f8641221328e2da7a06698a1b367ef1 (patch) | |
| tree | cc4a700d072dff78736d245d7c664be7ad2d32f0 /src/engine/SCons/Tool/mslink.py | |
| parent | b0656def14f9b2f7feff88301420c1dee99ac670 (diff) | |
| download | SCons-dfa9ded59f8641221328e2da7a06698a1b367ef1.zip SCons-dfa9ded59f8641221328e2da7a06698a1b367ef1.tar.gz SCons-dfa9ded59f8641221328e2da7a06698a1b367ef1.tar.bz2 | |
Initialize *FLAGS variables with objects that can add flags either as strings or lists.
Diffstat (limited to 'src/engine/SCons/Tool/mslink.py')
| -rw-r--r-- | src/engine/SCons/Tool/mslink.py | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/engine/SCons/Tool/mslink.py b/src/engine/SCons/Tool/mslink.py index 282fb22..fd53757 100644 --- a/src/engine/SCons/Tool/mslink.py +++ b/src/engine/SCons/Tool/mslink.py @@ -34,16 +34,15 @@ selection method. __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" import os.path -import string import SCons.Action import SCons.Defaults import SCons.Errors -import SCons.Util +import SCons.Platform.win32 import SCons.Tool -import SCons.Tool.msvs import SCons.Tool.msvc -import SCons.Platform.win32 +import SCons.Tool.msvs +import SCons.Util def pdbGenerator(env, target, source, for_signature): if target and env.has_key('PDB') and env['PDB']: @@ -137,13 +136,13 @@ def generate(env): SCons.Tool.createProgBuilder(env) env['SHLINK'] = '$LINK' - env['SHLINKFLAGS'] = '$LINKFLAGS /dll' + env['SHLINKFLAGS'] = SCons.Util.CLVar('$LINKFLAGS /dll') env['_SHLINK_TARGETS'] = win32ShlinkTargets env['_SHLINK_SOURCES'] = win32ShlinkSources env['SHLINKCOM'] = compositeLinkAction env['SHLIBEMITTER']= win32LibEmitter env['LINK'] = 'link' - env['LINKFLAGS'] = '/nologo' + env['LINKFLAGS'] = SCons.Util.CLVar('/nologo') env['_PDB'] = pdbGenerator env['LINKCOM'] = '${TEMPFILE("$LINK $LINKFLAGS /OUT:$TARGET $( $_LIBDIRFLAGS $) $_LIBFLAGS $_PDB $SOURCES")}' env['PROGEMITTER'] = prog_emitter |