summaryrefslogtreecommitdiffstats
path: root/src/engine/SCons/Tool/mslink.py
diff options
context:
space:
mode:
authorSteven Knight <knight@baldmt.com>2005-02-14 16:08:52 (GMT)
committerSteven Knight <knight@baldmt.com>2005-02-14 16:08:52 (GMT)
commit89400ba04cc1ce2d3c8245385114fe29f06d0c49 (patch)
tree62360857faec15f012268388a7b5f4b1e993e48f /src/engine/SCons/Tool/mslink.py
parent08d7c4cd103fb39b6010b980209a777ceea1ead2 (diff)
downloadSCons-89400ba04cc1ce2d3c8245385114fe29f06d0c49.zip
SCons-89400ba04cc1ce2d3c8245385114fe29f06d0c49.tar.gz
SCons-89400ba04cc1ce2d3c8245385114fe29f06d0c49.tar.bz2
Win32 portability.
Diffstat (limited to 'src/engine/SCons/Tool/mslink.py')
-rw-r--r--src/engine/SCons/Tool/mslink.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/engine/SCons/Tool/mslink.py b/src/engine/SCons/Tool/mslink.py
index 559a679..e05530e 100644
--- a/src/engine/SCons/Tool/mslink.py
+++ b/src/engine/SCons/Tool/mslink.py
@@ -186,7 +186,11 @@ def generate(env):
env['LDMODULEPREFIX'] = '$SHLIBPREFIX'
env['LDMODULESUFFIX'] = '$SHLIBSUFFIX'
env['LDMODULEFLAGS'] = '$SHLINKFLAGS'
- env['LDMODULECOM'] = '$SHLINKCOM'
+ # We can't use '$SHLINKCOM' here because that will stringify the
+ # action list on expansion, and will then try to execute expanded
+ # strings, with the upshot that it would try to execute RegServerFunc
+ # as a command.
+ env['LDMODULECOM'] = compositeLinkAction
def exists(env):
if SCons.Tool.msvs.is_msvs_installed():