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/build.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/build.py')
| -rw-r--r-- | mesonbuild/build.py | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/mesonbuild/build.py b/mesonbuild/build.py index d312abd..233d953 100644 --- a/mesonbuild/build.py +++ b/mesonbuild/build.py @@ -447,12 +447,6 @@ class ExtractedObjects(HoldableObject): 'in Unity builds. You can only extract all ' 'the object files for each compiler at once.') - def get_outputs(self, backend: 'Backend') -> T.List[str]: - return [ - backend.object_filename_from_source(self.target, source) - for source in self.get_sources(self.srclist, self.genlist) - ] - @dataclass(eq=False, order=False) class StructuredSources(HoldableObject): @@ -2878,7 +2872,7 @@ def get_sources_string_names(sources, backend): elif isinstance(s, (BuildTarget, CustomTarget, CustomTargetIndex, GeneratedList)): names += s.get_outputs() elif isinstance(s, ExtractedObjects): - names += s.get_outputs(backend) + names += backend.determine_ext_objs(s) elif isinstance(s, File): names.append(s.fname) else: |