diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2018-03-20 14:13:05 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2018-03-20 14:13:05 +0100 |
| commit | dc7e07c9b9780883a462c5973cd2ecad06fdb4ae (patch) | |
| tree | 14d185abfdd092a470e72ea27a3dad879145fb76 /guix/build/meson-build-system.scm | |
| parent | 616446ffbf9af9e8e5df0ef40c4e33dba9e25152 (diff) | |
| parent | dbc75dadb54dd0e6b3a125949c26aadfa3bff4ca (diff) | |
Merge branch 'staging'
Diffstat (limited to 'guix/build/meson-build-system.scm')
| -rw-r--r-- | guix/build/meson-build-system.scm | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/guix/build/meson-build-system.scm b/guix/build/meson-build-system.scm index 2b92240c52..e8cb5440eb 100644 --- a/guix/build/meson-build-system.scm +++ b/guix/build/meson-build-system.scm @@ -46,6 +46,15 @@ ,(string-append "--buildtype=" build-type) ,@configure-flags ,source-dir))) + + ;; Meson lacks good facilities for dealing with RUNPATH, so we + ;; add the output "lib" directory here to avoid doing that in + ;; many users. Related issues: + ;; * <https://github.com/mesonbuild/meson/issues/314> + ;; * <https://github.com/mesonbuild/meson/issues/3038> + ;; * <https://github.com/NixOS/nixpkgs/issues/31222> + (setenv "LDFLAGS" (string-append "-Wl,-rpath=" out "/lib")) + (mkdir build-dir) (chdir build-dir) (zero? (apply system* "meson" args)))) |