mirror of https://gitlab.com/ita1024/waf.git
Merge branch 'xcode6-py3-fix' into 'master'
Xcode6 py3 fix. See merge request ita1024/waf!2290
This commit is contained in:
commit
50dba21960
|
@ -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