mirror of https://gitlab.com/ita1024/waf.git
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:
parent
0c843e5d40
commit
495b7c0e04
|
@ -591,7 +591,7 @@ def process_xcode(self):
|
||||||
|
|
||||||
# The keys represents different build configuration, e.g. Debug, Release and so on..
|
# The keys represents different build configuration, e.g. Debug, Release and so on..
|
||||||
# Insert our generated build settings to all configuration names
|
# 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:
|
for k in keys:
|
||||||
if k in settings:
|
if k in settings:
|
||||||
settings[k].update(bldsettings)
|
settings[k].update(bldsettings)
|
||||||
|
|
Loading…
Reference in New Issue