summaryrefslogtreecommitdiff
path: root/guix/build/meson-build-system.scm
diff options
context:
space:
mode:
authorMarius Bakke <mbakke@fastmail.com>2018-04-01 12:37:15 +0200
committerMarius Bakke <mbakke@fastmail.com>2018-04-15 14:45:56 +0200
commit538d6d025cf40f890ea46131e917101cf1a7128b (patch)
tree421735978c1cf790c2efc53809e38eb5847b7e54 /guix/build/meson-build-system.scm
parentf6a6a050eae08df1fc39c2ecc9733aacf054356f (diff)
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)
Diffstat (limited to 'guix/build/meson-build-system.scm')
-rw-r--r--guix/build/meson-build-system.scm3
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)