mbakke pushed a commit to branch core-updates
in repository guix.
commit 611c27db2aec8c2f72bc0c1e5c7d126dc95b39b2
Author: Marius Bakke <[email protected]>
Date: Sun Apr 1 12:37:15 2018 +0200
build-system/meson: Don't override LDFLAGS if already set.
* guix/build/meson-build-system.scm (configure): Test for LDFLAGS before
adding ours.
---
guix/build/meson-build-system.scm | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/guix/build/meson-build-system.scm
b/guix/build/meson-build-system.scm
index e8cb544..e7690a4 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)
