diff options
| author | Dan Kegel <dank@kegel.com> | 2020-05-07 10:15:06 -0700 |
|---|---|---|
| committer | Dan Kegel <dank@kegel.com> | 2020-05-16 20:25:58 +0000 |
| commit | d7235c5905fa98207d90f3ad34bf590493498d5b (patch) | |
| tree | c93233a31beaefd89fdd9c18e4e566c7918a2b1e /mesonbuild/backend/ninjabackend.py | |
| parent | efb86088bcf8960db440eadcd11c0e073c80ab52 (diff) | |
| download | meson-d7235c5905fa98207d90f3ad34bf590493498d5b.zip meson-d7235c5905fa98207d90f3ad34bf590493498d5b.tar.gz meson-d7235c5905fa98207d90f3ad34bf590493498d5b.tar.bz2 | |
Let .pc files specify rpath.
Fixes #4027
Diffstat (limited to 'mesonbuild/backend/ninjabackend.py')
| -rw-r--r-- | mesonbuild/backend/ninjabackend.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py index 9b895c9..49025f9 100644 --- a/mesonbuild/backend/ninjabackend.py +++ b/mesonbuild/backend/ninjabackend.py @@ -1348,7 +1348,8 @@ int dummy; self.get_target_dir(target)) else: target_slashname_workaround_dir = self.get_target_dir(target) - rpath_args = rustc.build_rpath_args(self.environment, + (rpath_args, target.rpath_dirs_to_remove) = \ + rustc.build_rpath_args(self.environment, self.environment.get_build_dir(), target_slashname_workaround_dir, self.determine_rpath_dirs(target), @@ -2580,12 +2581,14 @@ https://gcc.gnu.org/bugzilla/show_bug.cgi?id=47485''')) self.get_target_dir(target)) else: target_slashname_workaround_dir = self.get_target_dir(target) - commands += linker.build_rpath_args(self.environment, + (rpath_args, target.rpath_dirs_to_remove) = \ + linker.build_rpath_args(self.environment, self.environment.get_build_dir(), target_slashname_workaround_dir, self.determine_rpath_dirs(target), target.build_rpath, target.install_rpath) + commands += rpath_args # Add libraries generated by custom targets custom_target_libraries = self.get_custom_target_provided_libraries(target) commands += extra_args |