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

backends: remove unused argument from determine_ext_objs 

The proj_dir_to_build_root argument of determine_ext_objs is always empty,
remove it.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2024-11-06 16:35:28 +01:00 committed by Jussi Pakkanen
parent dcfbd6974c
commit 41fe53a912
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mesonbuild/backend/backends.py
View File

@ -472,8 +472,8 @@ class Backend:
obj_list, deps = self._flatten_object_list(target, target.get_objects(), proj_dir_to_build_root)
return list(dict.fromkeys(obj_list)), deps
def determine_ext_objs(self, objects: build.ExtractedObjects, proj_dir_to_build_root: str = '') -> T.List[str]:
obj_list, _ = self._flatten_object_list(objects.target, [objects], proj_dir_to_build_root)
def determine_ext_objs(self, objects: build.ExtractedObjects) -> T.List[str]:
obj_list, _ = self._flatten_object_list(objects.target, [objects], '')
return list(dict.fromkeys(obj_list))
def _flatten_object_list(self, target: build.BuildTarget,

2
mesonbuild/backend/ninjabackend.py
View File

@ -3371,7 +3371,7 @@ https://gcc.gnu.org/bugzilla/show_bug.cgi?id=47485'''))
objects_from_static_libs: T.List[ExtractedObjects] = []
for dep in target.link_whole_targets:
l = dep.extract_all_objects(False)
objects_from_static_libs += self.determine_ext_objs(l, '')
objects_from_static_libs += self.determine_ext_objs(l)
objects_from_static_libs.extend(self.flatten_object_list(dep)[0])
return objects_from_static_libs