diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2018-04-30 19:26:03 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2018-04-30 19:26:03 +0200 |
| commit | a66853810e75055091e9ab5c2fc341fa1811cda4 (patch) | |
| tree | 2e5067741284ce5441e91b86de8f8113aa828343 /guix | |
| parent | fb8966abc43415ca6d1f141c44ebf0c563cea4d2 (diff) | |
| parent | a9fe3882b9400d6a49ca95e136e78477b3e81a07 (diff) | |
| download | gnu-guix-a66853810e75055091e9ab5c2fc341fa1811cda4.tar gnu-guix-a66853810e75055091e9ab5c2fc341fa1811cda4.tar.gz | |
Merge branch 'staging'
Diffstat (limited to 'guix')
| -rw-r--r-- | guix/build/meson-build-system.scm | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/guix/build/meson-build-system.scm b/guix/build/meson-build-system.scm index e8cb5440eb..e7690a4c37 100644 --- a/guix/build/meson-build-system.scm +++ b/guix/build/meson-build-system.scm @@ -53,7 +53,8 @@ ;; * <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")) + (unless (getenv "LDFLAGS") + (setenv "LDFLAGS" (string-append "-Wl,-rpath=" out "/lib"))) (mkdir build-dir) (chdir build-dir) |