diff options
| author | William Deegan <bill@baddogconsulting.com> | 2016-05-23 17:12:25 (GMT) |
|---|---|---|
| committer | William Deegan <bill@baddogconsulting.com> | 2016-05-23 17:12:25 (GMT) |
| commit | d1d7295a8ff27153b59b70b83b5ff1f3e96cc7dc (patch) | |
| tree | b1ce1106c723bdc2b197c9ecac003d49312d9f06 /src/engine/SCons | |
| parent | 89a20e7a132040e2429cb9124e6dcb535ec755b9 (diff) | |
| parent | 013d87ae5921b0bb55232a38257433ca256ee197 (diff) | |
| download | SCons-d1d7295a8ff27153b59b70b83b5ff1f3e96cc7dc.zip SCons-d1d7295a8ff27153b59b70b83b5ff1f3e96cc7dc.tar.gz SCons-d1d7295a8ff27153b59b70b83b5ff1f3e96cc7dc.tar.bz2 | |
merge from upstream
Diffstat (limited to 'src/engine/SCons')
| -rw-r--r-- | src/engine/SCons/Defaults.py | 4 | ||||
| -rw-r--r-- | src/engine/SCons/Script/__init__.py | 1 |
2 files changed, 3 insertions, 2 deletions
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', |