diff options
| author | Dylan Baker <dylan@pnwbakers.com> | 2021-11-08 14:08:30 -0800 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek.chauhan@gmail.com> | 2021-11-24 02:23:57 +0530 |
| commit | 73bac14c8fe7279037433b15b6c15bc93e9156a1 (patch) | |
| tree | b8a5432d4bfb1ae102257595fca8ae01fa671e6d /mesonbuild/backend/backends.py | |
| parent | f29b54dfe421487e86d0cf46d81794e192868f4e (diff) | |
| download | meson-73bac14c8fe7279037433b15b6c15bc93e9156a1.zip meson-73bac14c8fe7279037433b15b6c15bc93e9156a1.tar.gz meson-73bac14c8fe7279037433b15b6c15bc93e9156a1.tar.bz2 | |
backends/backends: recurse when looking for paths in bundled shared libraries
This previously worked because we were accidentally doing this via
mutation. However, doing this via mutation is not a good way to do it,
we should be explicit.
Fixes #9542
Diffstat (limited to 'mesonbuild/backend/backends.py')
| -rw-r--r-- | mesonbuild/backend/backends.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/mesonbuild/backend/backends.py b/mesonbuild/backend/backends.py index 19a575e..769ee6c 100644 --- a/mesonbuild/backend/backends.py +++ b/mesonbuild/backend/backends.py @@ -764,6 +764,9 @@ class Backend: paths.append(os.path.join(self.build_to_src, rel_to_src)) else: paths.append(libdir) + for i in chain(target.link_targets, target.link_whole_targets): + if isinstance(i, build.BuildTarget): + paths.extend(self.rpaths_for_bundled_shared_libraries(i, exclude_system)) return paths # This may take other types |