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

Xcode6 py3 fix. 

The return type of .keys() in Python 3 is no longer a list, but a 
'dict_keys', which does not support the '+' operator.
This commit is contained in:
Johan Pauwels 2020-05-14 20:26:43 +00:00 committed by Thomas Nagy
parent 0c843e5d40
commit 495b7c0e04
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
waflib/extras/xcode6.py
View File

@ -591,7 +591,7 @@ def process_xcode(self):
# The keys represents different build configuration, e.g. Debug, Release and so on..
# Insert our generated build settings to all configuration names
keys = set(settings.keys() + bld.env.PROJ_CONFIGURATION.keys())
keys = set(settings.keys()) | set(bld.env.PROJ_CONFIGURATION.keys())
for k in keys:
if k in settings:
settings[k].update(bldsettings)