diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2024-11-06 16:35:28 +0100 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2025-01-27 13:44:02 +0200 |
| commit | 41fe53a9120766b63b560c6c6e49cee3c67fc69d (patch) | |
| tree | ad4ed74ed3661e40da697dfe277e069faa95fdc3 | |
| parent | dcfbd6974c077f345e0351c7668d9441a311b58a (diff) | |
| download | meson-41fe53a9120766b63b560c6c6e49cee3c67fc69d.tar.gz | |
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>
| -rw-r--r-- | mesonbuild/backend/backends.py | 4 | ||||
| -rw-r--r-- | mesonbuild/backend/ninjabackend.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/mesonbuild/backend/backends.py b/mesonbuild/backend/backends.py index 66513720d..a6f3fabb6 100644 --- a/mesonbuild/backend/backends.py +++ b/mesonbuild/backend/backends.py @@ -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, diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py index cd35d2fcc..dce703fe4 100644 --- a/mesonbuild/backend/ninjabackend.py +++ b/mesonbuild/backend/ninjabackend.py @@ -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 |