diff options
| author | Charles Brunet <charles.brunet@optelgroup.com> | 2025-05-01 09:52:21 -0400 |
|---|---|---|
| committer | Jussi Pakkanen <jussi.pakkanen@mailbox.org> | 2025-08-01 15:54:21 +0300 |
| commit | 27bdac0f4b422e67ca03c0bcf43ed1e8275c7e5e (patch) | |
| tree | 61f190d06a2a5e52681cee134c0d8f3724edbddf | |
| parent | 63dcdf916186be32c8a82156b3bac6740d9759d3 (diff) | |
| download | meson-27bdac0f4b422e67ca03c0bcf43ed1e8275c7e5e.tar.gz | |
typing: determine_rpath_dirs is only called with BuildTarget
| -rw-r--r-- | mesonbuild/backend/backends.py | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/mesonbuild/backend/backends.py b/mesonbuild/backend/backends.py index 992f0e8a2..6c9b31543 100644 --- a/mesonbuild/backend/backends.py +++ b/mesonbuild/backend/backends.py @@ -825,9 +825,7 @@ class Backend: paths.update(self.rpaths_for_non_system_absolute_shared_libraries(i, exclude_system)) return list(paths) - # This may take other types - def determine_rpath_dirs(self, target: T.Union[build.BuildTarget, build.CustomTarget, build.CustomTargetIndex] - ) -> T.Tuple[str, ...]: + def determine_rpath_dirs(self, target: build.BuildTarget) -> T.Tuple[str, ...]: result: OrderedSet[str] if self.environment.coredata.optstore.get_value_for(OptionKey('layout')) == 'mirror': # Need a copy here @@ -835,9 +833,8 @@ class Backend: else: result = OrderedSet() result.add('meson-out') - if isinstance(target, build.BuildTarget): - result.update(self.rpaths_for_non_system_absolute_shared_libraries(target)) - target.rpath_dirs_to_remove.update([d.encode('utf-8') for d in result]) + result.update(self.rpaths_for_non_system_absolute_shared_libraries(target)) + target.rpath_dirs_to_remove.update([d.encode('utf-8') for d in result]) return tuple(result) @staticmethod |