diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2021-04-12 18:22:49 +0300 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2021-04-14 17:25:41 +0300 |
| commit | 96d85d601d84a23c6e4a7ca50cd02dc6b0bf5a09 (patch) | |
| tree | 95dbad2d262f5a38e7c5113aaed3bcc82b006605 | |
| parent | bb350aaf6f834255e5c1ff1d09a4efdd23f00f98 (diff) | |
| download | meson-96d85d601d84a23c6e4a7ca50cd02dc6b0bf5a09.zip meson-96d85d601d84a23c6e4a7ca50cd02dc6b0bf5a09.tar.gz meson-96d85d601d84a23c6e4a7ca50cd02dc6b0bf5a09.tar.bz2 | |
Xcode: fix path of extracted objects in subdirs.
| -rw-r--r-- | mesonbuild/backend/xcodebackend.py | 2 | ||||
| -rw-r--r-- | 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 47950f2..1ad7a69 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 3a42806..000e1aa 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') |