From 96d85d601d84a23c6e4a7ca50cd02dc6b0bf5a09 Mon Sep 17 00:00:00 2001 From: Jussi Pakkanen Date: Mon, 12 Apr 2021 18:22:49 +0300 Subject: [PATCH] Xcode: fix path of extracted objects in subdirs. --- mesonbuild/backend/xcodebackend.py | 2 +- test cases/common/78 extract from nested subdir/meson.build | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mesonbuild/backend/xcodebackend.py b/mesonbuild/backend/xcodebackend.py index 47950f22c..1ad7a6999 100644 --- a/mesonbuild/backend/xcodebackend.py +++ b/mesonbuild/backend/xcodebackend.py @@ -1077,7 +1077,7 @@ class XCodeBackend(backends.Backend): if isinstance(o, build.ExtractedObjects): added_objs = set() for objname_rel in o.get_outputs(self): - objname_abs = os.path.join(self.environment.get_build_dir(), objname_rel) + objname_abs = os.path.join(self.environment.get_build_dir(), o.target.subdir, objname_rel) if objname_abs not in added_objs: added_objs.add(objname_abs) ldargs += [r'\"' + objname_abs + r'\"'] diff --git a/test cases/common/78 extract from nested subdir/meson.build b/test cases/common/78 extract from nested subdir/meson.build index 3a42806f0..000e1aa6a 100644 --- a/test cases/common/78 extract from nested subdir/meson.build +++ b/test cases/common/78 extract from nested subdir/meson.build @@ -1,4 +1,4 @@ -project('Extract objects from subdirs.', 'c') +project('Extract objects from subdirs', 'c') if meson.is_unity() message('Unity build: skipping incompatible test')