aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2021-04-12 17:57:36 +0300
committerJussi Pakkanen <jpakkane@gmail.com>2021-04-14 17:25:41 +0300
commitbb350aaf6f834255e5c1ff1d09a4efdd23f00f98 (patch)
tree38c41c9db9dbf1f438e4bb9b26a6bae1b1772dbf /mesonbuild
parenta9d075aaf98ce3a430b4aaa39955c197ff2d2498 (diff)
downloadmeson-bb350aaf6f834255e5c1ff1d09a4efdd23f00f98.zip
meson-bb350aaf6f834255e5c1ff1d09a4efdd23f00f98.tar.gz
meson-bb350aaf6f834255e5c1ff1d09a4efdd23f00f98.tar.bz2
Xcode: use correct key for file id lookup.
Diffstat (limited to 'mesonbuild')
-rw-r--r--mesonbuild/backend/xcodebackend.py8
1 files changed, 5 insertions, 3 deletions
diff --git a/mesonbuild/backend/xcodebackend.py b/mesonbuild/backend/xcodebackend.py
index cb5e330..47950f2 100644
--- a/mesonbuild/backend/xcodebackend.py
+++ b/mesonbuild/backend/xcodebackend.py
@@ -725,9 +725,11 @@ class XCodeBackend(backends.Backend):
source_files_dict.add_item('children', source_file_children)
for s in t.sources:
if isinstance(s, mesonlib.File):
- s = os.path.join(t.subdir, s.fname)
- if not isinstance(s, str):
- clontinue
+ s = os.path.join(s.subdir, s.fname)
+ elif isinstance(s, str):
+ s = os.path.joni(t.subdir, s)
+ else:
+ continue
source_file_children.add_item(self.fileref_ids[(tname, s)], s)
for o in t.objects:
if isinstance(o, build.ExtractedObjects):