[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
07/08: build-system/meson: Don't override LDFLAGS if already set.
From: |
Marius Bakke |
Subject: |
07/08: build-system/meson: Don't override LDFLAGS if already set. |
Date: |
Sun, 15 Apr 2018 08:50:45 -0400 (EDT) |
mbakke pushed a commit to branch staging
in repository guix.
commit 538d6d025cf40f890ea46131e917101cf1a7128b
Author: Marius Bakke <address@hidden>
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.
(cherry picked from commit 611c27db2aec8c2f72bc0c1e5c7d126dc95b39b2)
---
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)
- branch staging updated (9190340 -> 73a118b), Marius Bakke, 2018/04/15
- 01/08: gnu: nss, nss-certs: Update to 3.36.1., Marius Bakke, 2018/04/15
- 02/08: gnu: mesa: Update to 17.3.8., Marius Bakke, 2018/04/15
- 05/08: gnu: alsa-plugins: Update to 1.1.6., Marius Bakke, 2018/04/15
- 03/08: gnu: alsa-lib: Update to 1.1.6., Marius Bakke, 2018/04/15
- 04/08: gnu: alsa-utils: Update to 1.1.6., Marius Bakke, 2018/04/15
- 07/08: build-system/meson: Don't override LDFLAGS if already set.,
Marius Bakke <=
- 08/08: gnu: gdk-pixbuf: Update to 2.36.12., Marius Bakke, 2018/04/15
- 06/08: gnu: atk: Update to 2.28.1., Marius Bakke, 2018/04/15