diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2020-05-18 23:17:34 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-18 23:17:34 +0300 |
| commit | 751ea3df72f336fb038739f61b3901e2ff8e10c0 (patch) | |
| tree | c30b93d720bc1719645a00f2861c615ef07c119e /mesonbuild/backend/ninjabackend.py | |
| parent | bf34b971121d46d54f8870cd1faf420d6c0bafe5 (diff) | |
| parent | ac8319add14c80369f9d3e8e8c034a2fcb47ef9d (diff) | |
| download | meson-751ea3df72f336fb038739f61b3901e2ff8e10c0.zip meson-751ea3df72f336fb038739f61b3901e2ff8e10c0.tar.gz meson-751ea3df72f336fb038739f61b3901e2ff8e10c0.tar.bz2 | |
Merge pull request #7103 from dankegel/bug4027-rpath-remember
Let .pc files and LDFLAGS provide rpaths.
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 2aa5c2c..7300aaf 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 |