From 3bae827eca86e03b5e581dfc5a57f563f63dd33c Mon Sep 17 00:00:00 2001 From: Jussi Pakkanen Date: Mon, 12 Apr 2021 17:57:36 +0300 Subject: Use correct key for file id lookup. --- mesonbuild/backend/xcodebackend.py | 8 +++++--- 1 file 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): -- cgit v1.1