From 538d6d025cf40f890ea46131e917101cf1a7128b Mon Sep 17 00:00:00 2001
From: Marius Bakke <mbakke@fastmail.com>
Date: Sun, 1 Apr 2018 12:37:15 +0200
Subject: 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 611c27db2aec8c2f72bc0c1e5c7d126dc95b39b2)
---
 guix/build/meson-build-system.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'guix/build')

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 @@ (define* (configure #:key outputs configure-flags build-type
     ;; * <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)
-- 
cgit v1.2.3