summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGary Oberbrunner <garyo@oberbrunner.com>2009-01-07 02:44:29 (GMT)
committerGary Oberbrunner <garyo@oberbrunner.com>2009-01-07 02:44:29 (GMT)
commitca04c920d4ded4ec8f09ef3aecab02f5e195faae (patch)
treeed714a6761111fd4102a025a17ba9e3b76d7be00
parentf505ce27fed8a9ec06645c9de667dbffe71a232a (diff)
downloadSCons-ca04c920d4ded4ec8f09ef3aecab02f5e195faae.zip
SCons-ca04c920d4ded4ec8f09ef3aecab02f5e195faae.tar.gz
SCons-ca04c920d4ded4ec8f09ef3aecab02f5e195faae.tar.bz2
Fix issue #1175: allow WIN32_INSERT_DEF=0 to turn off --output-def in mingw link.
-rw-r--r--src/engine/SCons/Tool/mingw.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/engine/SCons/Tool/mingw.py b/src/engine/SCons/Tool/mingw.py
index 8c5e68a..a6e4478 100644
--- a/src/engine/SCons/Tool/mingw.py
+++ b/src/engine/SCons/Tool/mingw.py
@@ -62,7 +62,8 @@ def shlib_generator(target, source, env, for_signature):
if implib: cmd.append('-Wl,--out-implib,'+implib.get_string(for_signature))
def_target = env.FindIxes(target, 'WINDOWSDEFPREFIX', 'WINDOWSDEFSUFFIX')
- if def_target: cmd.append('-Wl,--output-def,'+def_target.get_string(for_signature))
+ if env.get("WIN32_INSERT_DEF",1) and def_target: \
+ cmd.append('-Wl,--output-def,'+def_target.get_string(for_signature))
return [cmd]