me
/
guix
Archived
1
0
Fork 0
Code

build-system/meson: Don't override LDFLAGS if already set. 

* guix/build/meson-build-system.scm (configure): Test for LDFLAGS before
adding ours.

(cherry picked from commit 611c27db2a)
master
Marius Bakke 2018-04-01 12:37:15 +02:00
parent f6a6a050ea
commit 538d6d025c
No known key found for this signature in database
GPG Key ID: A2A06DF2A33A54FA
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
guix/build/meson-build-system.scm
View File

@ -53,7 +53,8 @@
;; * <https://github.com/mesonbuild/meson/issues/314> ;; * <https://github.com/mesonbuild/meson/issues/314>
;; * <https://github.com/mesonbuild/meson/issues/3038> ;; * <https://github.com/mesonbuild/meson/issues/3038>
;; * <https://github.com/NixOS/nixpkgs/issues/31222> ;; * <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) (mkdir build-dir)
(chdir build-dir) (chdir build-dir)