From aafc0364fc0b6c318f9cf832c1d48c514d25ed5c Mon Sep 17 00:00:00 2001 From: Johan Pauwels Date: Thu, 14 May 2020 20:26:43 +0000 Subject: [PATCH] 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. --- waflib/extras/xcode6.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/waflib/extras/xcode6.py b/waflib/extras/xcode6.py index 91bbff18..0dd68b94 100644 --- a/waflib/extras/xcode6.py +++ b/waflib/extras/xcode6.py @@ -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)