diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/CHANGES.txt | 4 | ||||
| -rw-r--r-- | src/engine/SCons/Tool/mingw.py | 8 | ||||
| -rw-r--r-- | src/engine/SCons/Tool/mslink.xml | 2 |
3 files changed, 9 insertions, 5 deletions
diff --git a/src/CHANGES.txt b/src/CHANGES.txt index 6b8cf5f..dd0cc41 100644 --- a/src/CHANGES.txt +++ b/src/CHANGES.txt @@ -6,6 +6,10 @@ RELEASE 2.X.X - + From Joshua Hughes: + - Make Windows not redefine builtin file as un-inheritable (#2857) + - Fix WINDOWS_INSERT_DEF on MinGW (Windows) (#2856) + From smallbub on Bitbucket: - Fix LINKCOMSTR, SHLINKCOMSTR, and LDMODULECOMSTR on Windows (#2833). diff --git a/src/engine/SCons/Tool/mingw.py b/src/engine/SCons/Tool/mingw.py index 5827aae..83f8c93 100644 --- a/src/engine/SCons/Tool/mingw.py +++ b/src/engine/SCons/Tool/mingw.py @@ -100,12 +100,12 @@ def shlib_emitter(target, source, env): target.append(env.fs.File(targetStrings)) # Append a def file target if there isn't already a def file target - # or a def file source. There is no option to disable def file - # target emitting, because I can't figure out why someone would ever - # want to turn it off. + # or a def file source or the user has explicitly asked for the target + # to be emitted. def_source = env.FindIxes(source, 'WINDOWSDEFPREFIX', 'WINDOWSDEFSUFFIX') def_target = env.FindIxes(target, 'WINDOWSDEFPREFIX', 'WINDOWSDEFSUFFIX') - if not def_source and not def_target: + skip_def_insert = env.subst("$WINDOWS_INSERT_DEF") in ['', '0', 0] + if not def_source and not def_target and not skip_def_insert: # Create list of target libraries and def files as strings targetStrings=env.ReplaceIxes(dll, 'SHLIBPREFIX', 'SHLIBSUFFIX', diff --git a/src/engine/SCons/Tool/mslink.xml b/src/engine/SCons/Tool/mslink.xml index 35e8b64..80c5530 100644 --- a/src/engine/SCons/Tool/mslink.xml +++ b/src/engine/SCons/Tool/mslink.xml @@ -201,7 +201,7 @@ A deprecated synonym for &cv-link-WINDOWSEXPSUFFIX;. <summary> When this is set to true, a library build of a Windows shared library -(<filename>.dll</filename>file) +(<filename>.dll</filename> file) will also build a corresponding <filename>.def</filename> file at the same time, if a <filename>.def</filename> file |