* [bug#31014] [PATCH core-updates] build-system/meson: Don't override LDFLAGS if already set.
@ 2018-04-01 10:38 Marius Bakke
2018-04-01 12:38 ` Ludovic Courtès
0 siblings, 1 reply; 3+ messages in thread
From: Marius Bakke @ 2018-04-01 10:38 UTC (permalink / raw)
To: 31014
* 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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [bug#31014] [PATCH core-updates] build-system/meson: Don't override LDFLAGS if already set.
2018-04-01 10:38 [bug#31014] [PATCH core-updates] build-system/meson: Don't override LDFLAGS if already set Marius Bakke
@ 2018-04-01 12:38 ` Ludovic Courtès
2018-04-02 1:05 ` bug#31014: " Marius Bakke
0 siblings, 1 reply; 3+ messages in thread
From: Ludovic Courtès @ 2018-04-01 12:38 UTC (permalink / raw)
To: Marius Bakke; +Cc: 31014
Marius Bakke <mbakke@fastmail.com> 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!).
Thanks,
Ludo’.
^ permalink raw reply [flat|nested] 3+ messages in thread
* bug#31014: [PATCH core-updates] build-system/meson: Don't override LDFLAGS if already set.
2018-04-01 12:38 ` Ludovic Courtès
@ 2018-04-02 1:05 ` Marius Bakke
0 siblings, 0 replies; 3+ messages in thread
From: Marius Bakke @ 2018-04-02 1:05 UTC (permalink / raw)
To: Ludovic Courtès; +Cc: 31014-done
[-- Attachment #1: Type: text/plain, Size: 547 bytes --]
Ludovic Courtès <ludo@gnu.org> writes:
> Marius Bakke <mbakke@fastmail.com> 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!
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-04-02 1:06 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-04-01 10:38 [bug#31014] [PATCH core-updates] build-system/meson: Don't override LDFLAGS if already set Marius Bakke
2018-04-01 12:38 ` Ludovic Courtès
2018-04-02 1:05 ` bug#31014: " Marius Bakke
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).