diff options
| author | William Deegan <bill@baddogconsulting.com> | 2019-03-11 19:54:16 (GMT) |
|---|---|---|
| committer | William Deegan <bill@baddogconsulting.com> | 2019-03-11 19:54:16 (GMT) |
| commit | df613e42c8cdd9f257dfdce157be140a519f6bd1 (patch) | |
| tree | b92b9b6a48b9081e62e003424f75680551e30899 /src | |
| parent | 6a0f197c4540d11f5edaf216c4300347eea957ed (diff) | |
| download | SCons-df613e42c8cdd9f257dfdce157be140a519f6bd1.zip SCons-df613e42c8cdd9f257dfdce157be140a519f6bd1.tar.gz SCons-df613e42c8cdd9f257dfdce157be140a519f6bd1.tar.bz2 | |
Fix issue #2799 - Get mingw tool to respect SHCCCOMSTR, SHLINKCOMSTR and LDMODULECOMSTR
Diffstat (limited to 'src')
| -rw-r--r-- | src/engine/SCons/Tool/mingw.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/engine/SCons/Tool/mingw.py b/src/engine/SCons/Tool/mingw.py index ce31f88..311a955 100644 --- a/src/engine/SCons/Tool/mingw.py +++ b/src/engine/SCons/Tool/mingw.py @@ -107,7 +107,8 @@ def shlib_emitter(target, source, env): return (target, source) -shlib_action = SCons.Action.Action(shlib_generator, generator=1) +shlib_action = SCons.Action.Action(shlib_generator, '$SHLINKCOMSTR', generator=1) +ldmodule_action = SCons.Action.Action(shlib_generator, '$LDMODULECOMSTR', generator=1) res_action = SCons.Action.Action('$RCCOM', '$RCCOMSTR') @@ -161,7 +162,7 @@ def generate(env): env['SHCXXFLAGS'] = SCons.Util.CLVar('$CXXFLAGS') env['SHLINKFLAGS'] = SCons.Util.CLVar('$LINKFLAGS -shared') env['SHLINKCOM'] = shlib_action - env['LDMODULECOM'] = shlib_action + env['LDMODULECOM'] = ldmodule_action env.Append(SHLIBEMITTER = [shlib_emitter]) env.Append(LDMODULEEMITTER = [shlib_emitter]) env['AS'] = 'as' |