guix-patches
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[bug#31014] [PATCH core-updates] build-system/meson: Don't override LDFL


From: Marius Bakke
Subject: [bug#31014] [PATCH core-updates] build-system/meson: Don't override LDFLAGS if already set.
Date: Sun, 1 Apr 2018 12:38:45 +0200

* 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 e8cb5440e..e7690a4c3 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)
-- 
2.16.3






reply via email to

[Prev in Thread] Current Thread [Next in Thread]