Virtualization
/
meson
mirror of https://gitlab.com/qemu-project/meson.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Xcode: fix path of extracted objects in subdirs.

This commit is contained in:
Jussi Pakkanen 2021-04-12 18:22:49 +03:00
parent bb350aaf6f
commit 96d85d601d
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mesonbuild/backend/xcodebackend.py
View File

@ -1077,7 +1077,7 @@ class XCodeBackend(backends.Backend):
if isinstance(o, build.ExtractedObjects): if isinstance(o, build.ExtractedObjects):
added_objs = set() added_objs = set()
for objname_rel in o.get_outputs(self): 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: if objname_abs not in added_objs:
added_objs.add(objname_abs) added_objs.add(objname_abs)
ldargs += [r'\"' + objname_abs + r'\"'] ldargs += [r'\"' + objname_abs + r'\"']

2
test cases/common/78 extract from nested subdir/meson.build
View File

@ -1,4 +1,4 @@
project('Extract objects from subdirs.', 'c') project('Extract objects from subdirs', 'c')
if meson.is_unity() if meson.is_unity()
message('Unity build: skipping incompatible test') message('Unity build: skipping incompatible test')