diff options
author | Paolo Bonzini <pbonzini@redhat.com> | 2022-05-23 14:09:43 +0200 |
---|---|---|
committer | Dylan Baker <dylan@pnwbakers.com> | 2022-06-14 10:11:22 -0700 |
commit | e4a8f4dbd64dce546b9a7651774b572f52b8f20f (patch) | |
tree | c226dac9ab8ea29be339a20b367ee74aed902132 /mesonbuild/backend/xcodebackend.py | |
parent | dae986073d5ab3a6241cecaf3362065256400772 (diff) | |
download | meson-e4a8f4dbd64dce546b9a7651774b572f52b8f20f.zip meson-e4a8f4dbd64dce546b9a7651774b572f52b8f20f.tar.gz meson-e4a8f4dbd64dce546b9a7651774b572f52b8f20f.tar.bz2 |
backend: always use the same code to compute the files in ExtractedObjects
Instead of asking the ExtractedObjects, but with a hook back into the backend,
use the existing function in the backend itself. This fixes using the
extract_objects(...) of a generated source file in a custom_target.
It should also fix recursive extract_all_objects with the Xcode backend.
Fixes: #10394
Diffstat (limited to 'mesonbuild/backend/xcodebackend.py')
-rw-r--r-- | mesonbuild/backend/xcodebackend.py | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/mesonbuild/backend/xcodebackend.py b/mesonbuild/backend/xcodebackend.py index 326c4b6..0d8bafb 100644 --- a/mesonbuild/backend/xcodebackend.py +++ b/mesonbuild/backend/xcodebackend.py @@ -259,9 +259,6 @@ class XCodeBackend(backends.Backend): obj_path = f'{project}.build/{buildtype}/{tname}.build/Objects-normal/{arch}/{stem}.o' return obj_path - def get_extracted_obj_paths(self, target: build.BuildTarget, outputs: T.List[str]) -> T.List[str]: - return outputs - def generate(self): self.serialize_tests() # Cache the result as the method rebuilds the array every time it is called. @@ -1469,7 +1466,7 @@ class XCodeBackend(backends.Backend): # Add extracted objects to the link line by hand. if isinstance(o, build.ExtractedObjects): added_objs = set() - for objname_rel in o.get_outputs(self): + for objname_rel in self.determine_ext_objs(o): 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) |