--- Begin Message ---
Subject: |
[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
--- End Message ---
--- Begin Message ---
Subject: |
Re: [bug#31014] [PATCH core-updates] build-system/meson: Don't override LDFLAGS if already set. |
Date: |
Mon, 02 Apr 2018 03:05:19 +0200 |
User-agent: |
Notmuch/0.26 (https://notmuchmail.org) Emacs/25.3.1 (x86_64-pc-linux-gnu) |
Ludovic Courtès <address@hidden> writes:
> Marius Bakke <address@hidden> skribis:
>
>> * guix/build/meson-build-system.scm (configure): Test for LDFLAGS before
>> adding ours.
>
> LGTM!
>
> It might make sense eventually to add #:ld-flags and have only one place
> that calls ‘setenv’, for clarity (global variables are evil!).
I agree that would be nicer. I'll try to add something like that before
the next rebuild. I keep hoping that upstream will improve the RUNPATH
situation, but not holding my breath.
Pushed!
signature.asc
Description: PGP signature
--- End Message ---