FWGS
/
waf
mirror of https://gitlab.com/ita1024/waf.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Revert the prune_flags changes. 

The changes break flags such as -framework X -framework Y.
This commit is contained in:
Krzysztof Kosiński 2014-01-27 16:34:40 +01:00
parent c9fe554af4
commit 6f18c1bd99
1 changed files with 0 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
waflib/Tools/ccroot.py
View File

@ -13,12 +13,6 @@ from waflib.TaskGen import after_method, before_method, feature, taskgen_method,
from waflib.Tools import c_aliases, c_preproc, c_config, c_osx, c_tests
from waflib.Configure import conf
prune_flags = False
"""
Boolean specifying whether only one instance of a given compiler flag
should be left in the command line.
"""
SYSTEM_LIB_PATHS = ['/usr/lib64', '/usr/lib', '/usr/local/lib64', '/usr/local/lib']
USELIB_VARS = Utils.defaultdict(set)
@ -426,18 +420,6 @@ def propagate_uselib_vars(self):
for v in _vars:
env.append_value(v, env[v + '_' + x])
# remove redundant values, leaving only the last instance of a flag
# leaving only the last flag is important for static libraries which depend on each other
if getattr(self, 'prune_flags', prune_flags):
for v in _vars:
uniqued = []
seen = set()
for a in reversed(env[v]):
if a not in seen:
seen.add(a)
uniqued.append(a)
env[v] = list(reversed(uniqued))
# ============ the code above must not know anything about import libs ==========
@feature('cshlib', 'cxxshlib', 'fcshlib')