diff options
| author | LaurentMarchelli <devnull@localhost> | 2014-12-02 09:38:30 (GMT) |
|---|---|---|
| committer | LaurentMarchelli <devnull@localhost> | 2014-12-02 09:38:30 (GMT) |
| commit | f0121389aa88ab9a3d232f5e516850d2aad2bf00 (patch) | |
| tree | acd865492bc1758a454e24b9882c91d324bd3f48 /src/engine/SCons/Tool/mslink.py | |
| parent | 03a3cc469fc3ac561ffcb81efe38fd08d4e9aa45 (diff) | |
| download | SCons-f0121389aa88ab9a3d232f5e516850d2aad2bf00.zip SCons-f0121389aa88ab9a3d232f5e516850d2aad2bf00.tar.gz SCons-f0121389aa88ab9a3d232f5e516850d2aad2bf00.tar.bz2 | |
TempFileMunge does not use env['CXXCOMSTR'] for output display.
Diffstat (limited to 'src/engine/SCons/Tool/mslink.py')
| -rw-r--r-- | src/engine/SCons/Tool/mslink.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/engine/SCons/Tool/mslink.py b/src/engine/SCons/Tool/mslink.py index 40f112b..37af34e 100644 --- a/src/engine/SCons/Tool/mslink.py +++ b/src/engine/SCons/Tool/mslink.py @@ -237,11 +237,11 @@ embedManifestExeCheckAction = SCons.Action.Action(embedManifestExeCheck, None) regServerAction = SCons.Action.Action("$REGSVRCOM", "$REGSVRCOMSTR") regServerCheck = SCons.Action.Action(RegServerFunc, None) -shlibLinkAction = SCons.Action.Action('${TEMPFILE("$SHLINK $SHLINKFLAGS $_SHLINK_TARGETS $_LIBDIRFLAGS $_LIBFLAGS $_PDB $_SHLINK_SOURCES")}', '$SHLINKCOMSTR') +shlibLinkAction = SCons.Action.Action('${TEMPFILE("$SHLINK $SHLINKFLAGS $_SHLINK_TARGETS $_LIBDIRFLAGS $_LIBFLAGS $_PDB $_SHLINK_SOURCES", "$SHLINKCOMSTR")}', '$SHLINKCOMSTR') compositeShLinkAction = shlibLinkAction + regServerCheck + embedManifestDllCheckAction -ldmodLinkAction = SCons.Action.Action('${TEMPFILE("$LDMODULE $LDMODULEFLAGS $_LDMODULE_TARGETS $_LIBDIRFLAGS $_LIBFLAGS $_PDB $_LDMODULE_SOURCES")}', '$LDMODULECOMSTR') +ldmodLinkAction = SCons.Action.Action('${TEMPFILE("$LDMODULE $LDMODULEFLAGS $_LDMODULE_TARGETS $_LIBDIRFLAGS $_LIBFLAGS $_PDB $_LDMODULE_SOURCES", "$LDMODULECOMSTR")}', '$LDMODULECOMSTR') compositeLdmodAction = ldmodLinkAction + regServerCheck + embedManifestDllCheckAction -exeLinkAction = SCons.Action.Action('${TEMPFILE("$LINK $LINKFLAGS /OUT:$TARGET.windows $_LIBDIRFLAGS $_LIBFLAGS $_PDB $SOURCES.windows")}', '$LINKCOMSTR') +exeLinkAction = SCons.Action.Action('${TEMPFILE("$LINK $LINKFLAGS /OUT:$TARGET.windows $_LIBDIRFLAGS $_LIBFLAGS $_PDB $SOURCES.windows", "$LINKCOMSTR")}', '$LINKCOMSTR') compositeLinkAction = exeLinkAction + embedManifestExeCheckAction def generate(env): |