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

Prevent xcode6 from overwriting features lists #2038

This commit is contained in:
Thomas Nagy 2017-09-21 21:37:36 +02:00
parent 31d32c3f49
commit c113442738
No known key found for this signature in database
GPG Key ID: 49B4C67C05277AAA
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
waflib/extras/xcode6.py
View File

@ -529,7 +529,7 @@ def process_xcode(self):
is_valid_file_extension = lambda file: os.path.splitext(file.path)[1] in XCODE_EXTS
sources = list(filter(is_valid_file_extension, sources))
buildfiles = [bld.unique_buildfile(PBXBuildFile(fileref)) for fileref in sources]
buildfiles = [bld.unique_buildfile(PBXBuildFile(x)) for x in sources]
target.add_build_phase(PBXSourcesBuildPhase(buildfiles))
# Check if any framework to link against is some other target we've made
@ -711,7 +711,10 @@ def bind_fun(tgtype):
elif tgtype == 'stlib':
features = 'cxx cxxstlib'
tgtype = 'stlib'
kw['features'] = features
lst = kw['features'] = Utils.to_list(kw.get('features', []))
for x in features.split():
if not x in kw['features']:
lst.append(x)
kw['target_type'] = tgtype
return self(*k, **kw)