summaryrefslogtreecommitdiffstats
path: root/src/engine/SCons/Tool/linkloc.py
diff options
context:
space:
mode:
authorSteven Knight <knight@baldmt.com>2004-02-26 05:56:51 (GMT)
committerSteven Knight <knight@baldmt.com>2004-02-26 05:56:51 (GMT)
commitdfa9ded59f8641221328e2da7a06698a1b367ef1 (patch)
treecc4a700d072dff78736d245d7c664be7ad2d32f0 /src/engine/SCons/Tool/linkloc.py
parentb0656def14f9b2f7feff88301420c1dee99ac670 (diff)
downloadSCons-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/linkloc.py')
-rw-r--r--src/engine/SCons/Tool/linkloc.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/engine/SCons/Tool/linkloc.py b/src/engine/SCons/Tool/linkloc.py
index 313a16b..a5b2bdd 100644
--- a/src/engine/SCons/Tool/linkloc.py
+++ b/src/engine/SCons/Tool/linkloc.py
@@ -35,7 +35,6 @@ selection method.
__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
import os.path
-import string
import re
import SCons.Action
@@ -84,11 +83,11 @@ def generate(env):
env['SUBST_CMD_FILE'] = LinklocGenerator
env['SHLINK'] = '$LINK'
- env['SHLINKFLAGS'] = '$LINKFLAGS'
+ env['SHLINKFLAGS'] = SCons.Util.CLVar('$LINKFLAGS')
env['SHLINKCOM'] = '${SUBST_CMD_FILE("$SHLINK $SHLINKFLAGS $( $_LIBDIRFLAGS $) $_LIBFLAGS -dll $TARGET $SOURCES")}'
env['SHLIBEMITTER']= None
env['LINK'] = "linkloc"
- env['LINKFLAGS'] = ''
+ env['LINKFLAGS'] = SCons.Util.CLVar('')
env['LINKCOM'] = '${SUBST_CMD_FILE("$LINK $LINKFLAGS $( $_LIBDIRFLAGS $) $_LIBFLAGS -exe $TARGET $SOURCES")}'
env['LIBDIRPREFIX']='-libpath '
env['LIBDIRSUFFIX']=''