diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2017-07-21 22:19:07 +0300 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2017-07-21 22:19:07 +0300 |
| commit | bff37a90fc475c6204087dcf1ccb6734b990141e (patch) | |
| tree | d228c8107a4daf66e76f3d0fa4a03e5e689c55e9 /mesonbuild/backend | |
| parent | 328a1f30fdfdadc6d5df4ebfc075e9cd5c0df96e (diff) | |
| parent | e82edc179fe86e68d1f74fe084fd891ef2d12316 (diff) | |
| download | meson-bff37a90fc475c6204087dcf1ccb6734b990141e.zip meson-bff37a90fc475c6204087dcf1ccb6734b990141e.tar.gz meson-bff37a90fc475c6204087dcf1ccb6734b990141e.tar.bz2 | |
Merged buildrpath branch.
Diffstat (limited to 'mesonbuild/backend')
| -rw-r--r-- | mesonbuild/backend/ninjabackend.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py index 222e01d..08ae456 100644 --- a/mesonbuild/backend/ninjabackend.py +++ b/mesonbuild/backend/ninjabackend.py @@ -1214,6 +1214,7 @@ int dummy; rpath_args = rustc.build_rpath_args(self.environment.get_build_dir(), target_slashname_workaround_dir, self.determine_rpath_dirs(target), + target.build_rpath, target.install_rpath) # ... but then add rustc's sysroot to account for rustup # installations @@ -2393,6 +2394,7 @@ rule FORTRAN_DEP_HACK commands += linker.build_rpath_args(self.environment.get_build_dir(), target_slashname_workaround_dir, self.determine_rpath_dirs(target), + target.build_rpath, target.install_rpath) # Add libraries generated by custom targets custom_target_libraries = self.get_custom_target_provided_libraries(target) |