diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/CHANGES.txt | 9 | ||||
| -rw-r--r-- | src/engine/SCons/Defaults.py | 4 | ||||
| -rw-r--r-- | src/engine/SCons/Script/__init__.py | 1 |
3 files changed, 12 insertions, 2 deletions
diff --git a/src/CHANGES.txt b/src/CHANGES.txt index b6973b7..25f982a 100644 --- a/src/CHANGES.txt +++ b/src/CHANGES.txt @@ -11,6 +11,15 @@ RELEASE VERSION/DATE TO BE FILLED IN LATER - Whatever John Doe did. + From Paweł Tomulik: + - Fixed the issue with LDMODULEVERSIONFLAGS reported by Tim Jennes + (https://pairlist4.pair.net/pipermail/scons-users/2016-May/004893.html). + An error was causing “-Wl,Bsymbolic” being added to linker's command-line + even when there was no specified value in LDMODULEVERSION and thus no + need for the flags to be specified. + - Added LoadableModule to the list of global functions (DefaultEnvironment + builders). + RELEASE 2.5.0 - Mon, 09 Apr 2016 11:27:42 -0700 From Dirk Baechle: diff --git a/src/engine/SCons/Defaults.py b/src/engine/SCons/Defaults.py index 6344975..37cbc99 100644 --- a/src/engine/SCons/Defaults.py +++ b/src/engine/SCons/Defaults.py @@ -540,10 +540,10 @@ class Variable_Method_Caller(object): frame = frame.f_back return None -# if env[version_var] id defined, returns env[flags_var], otherwise returns None +# if $version_var is not empty, returns env[flags_var], otherwise returns None def __libversionflags(env, version_var, flags_var): try: - if env[version_var]: + if env.subst('$'+version_var): return env[flags_var] except KeyError: pass diff --git a/src/engine/SCons/Script/__init__.py b/src/engine/SCons/Script/__init__.py index a0c61c5..be6e5ce 100644 --- a/src/engine/SCons/Script/__init__.py +++ b/src/engine/SCons/Script/__init__.py @@ -354,6 +354,7 @@ GlobalDefaultBuilders = [ 'Java', 'JavaH', 'Library', + 'LoadableModule', 'M4', 'MSVSProject', 'Object', |