2
0
mirror of https://gitlab.com/ita1024/waf.git synced 2024-11-29 13:30:32 +01:00

Merge branch 'xcode6-py3-fix' into 'master'

Xcode6 py3 fix.

See merge request ita1024/waf!2290
This commit is contained in:
ita1024 2020-05-15 06:01:40 +00:00
commit c271a2cb08

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)