diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2019-08-20 23:14:05 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-20 23:14:05 +0300 |
| commit | 1ea3ddc6ad7458bbcb51704ccb5ef266c5164074 (patch) | |
| tree | 62540e1b93a4844a5e5c45395a63bbfa3ec419d3 /mesonbuild/backend | |
| parent | 0384487fc52c445d005ca1ea5b2a1c83ce56200c (diff) | |
| parent | 142012ab73bf1cfedb59f539400f0c18df055ec8 (diff) | |
| download | meson-1ea3ddc6ad7458bbcb51704ccb5ef266c5164074.zip meson-1ea3ddc6ad7458bbcb51704ccb5ef266c5164074.tar.gz meson-1ea3ddc6ad7458bbcb51704ccb5ef266c5164074.tar.bz2 | |
Merge pull request #5681 from dcbaker/dynamic-linker-split
split dynamic linker representations from compilers
Diffstat (limited to 'mesonbuild/backend')
| -rw-r--r-- | mesonbuild/backend/ninjabackend.py | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py index eb28f1a..82e70c9 100644 --- a/mesonbuild/backend/ninjabackend.py +++ b/mesonbuild/backend/ninjabackend.py @@ -1328,7 +1328,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.get_build_dir(), + rpath_args = rustc.build_rpath_args(self.environment, + self.environment.get_build_dir(), target_slashname_workaround_dir, self.determine_rpath_dirs(target), target.build_rpath, @@ -2325,9 +2326,10 @@ https://gcc.gnu.org/bugzilla/show_bug.cgi?id=47485''')) # All shared libraries are PIC commands += linker.get_pic_args() # Add -Wl,-soname arguments on Linux, -install_name on OS X - commands += linker.get_soname_args(target.prefix, target.name, target.suffix, - target.soversion, target.darwin_versions, - isinstance(target, build.SharedModule)) + commands += linker.get_soname_args( + self.environment, target.prefix, target.name, target.suffix, + target.soversion, target.darwin_versions, + isinstance(target, build.SharedModule)) # This is only visited when building for Windows using either GCC or Visual Studio if target.vs_module_defs and hasattr(linker, 'gen_vs_module_defs_args'): commands += linker.gen_vs_module_defs_args(target.vs_module_defs.rel_to_builddir(self.build_to_src)) @@ -2538,7 +2540,8 @@ 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.get_build_dir(), + commands += linker.build_rpath_args(self.environment, + self.environment.get_build_dir(), target_slashname_workaround_dir, self.determine_rpath_dirs(target), target.build_rpath, |