[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
84/180: gnu: make-ld-wrapper: Add a LINKER argument.
From: |
guix-commits |
Subject: |
84/180: gnu: make-ld-wrapper: Add a LINKER argument. |
Date: |
Fri, 29 Oct 2021 15:56:49 -0400 (EDT) |
apteryx pushed a commit to branch core-updates-frozen-batched-changes
in repository guix.
commit 5ebe2836a9742e5cd23758b8391411b066aaefd9
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Tue Sep 14 10:44:30 2021 -0400
gnu: make-ld-wrapper: Add a LINKER argument.
This allows creating wrappers for other linkers than "ld", such as
"ld.gold".
* gnu/packages/base.scm (make-ld-wrapper): New variable.
[linker]: New argument. Update doc.
<ld>: Use LINKER to derive the linker source.
---
gnu/packages/base.scm | 21 ++++++++++++---------
1 file changed, 12 insertions(+), 9 deletions(-)
diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm
index e14cf9a..41641c7 100644
--- a/gnu/packages/base.scm
+++ b/gnu/packages/base.scm
@@ -19,6 +19,7 @@
;;; Copyright © 2021 Leo Le Bouter <lle-bout@zaclys.net>
;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be>
;;; Copyright © 2021 Guillaume Le Vaillant <glv@posteo.net>
+;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -71,6 +72,7 @@
#:use-module (srfi srfi-1)
#:use-module (srfi srfi-26)
#:export (glibc
+ make-ld-wrapper
libiconv-if-needed))
;;; Commentary:
@@ -603,6 +605,7 @@ included.")
(define* (make-ld-wrapper name #:key
(target (const #f))
binutils
+ (linker "ld")
(guile (canonical-package guile-3.0))
(bash (canonical-package bash))
(guile-for-build guile))
@@ -612,7 +615,9 @@ wrapper uses GUILE and BASH.
TARGET must be a one-argument procedure that, given a system type, returns a
cross-compilation target triplet or #f. When the result is not #f, make a
-wrapper for the cross-linker for that target, called 'TARGET-ld'."
+wrapper for the cross-linker for that target, called 'TARGET-ld'. To use a
+different linker than the default \"ld\", such as \"ld.gold\" the linker name
+can be provided via the LINKER argument."
;; Note: #:system->target-triplet is a procedure so that the evaluation of
;; its result can be delayed until the 'arguments' field is evaluated, thus
;; in a context where '%current-system' is accurate.
@@ -637,8 +642,9 @@ wrapper for the cross-linker for that target, called
'TARGET-ld'."
(let* ((out (assoc-ref %outputs "out"))
(bin (string-append out "/bin"))
(ld ,(if target
- `(string-append bin "/" ,target "-ld")
- '(string-append bin "/ld")))
+ `(string-append bin "/" ,target "-"
+ ,linker)
+ `(string-append bin "/" ,linker)))
(go (string-append ld ".go")))
(setvbuf (current-output-port)
@@ -663,11 +669,10 @@ wrapper for the cross-linker for that target, called
'TARGET-ld'."
(string-append (assoc-ref %build-inputs "binutils")
,(if target
(string-append "/bin/"
- target "-ld")
- "/bin/ld"))))
+ target "-" linker)
+ (string-append "/bin/"
linker)))))
(chmod ld #o555)
- (compile-file ld #:output-file go)
- #t)))))
+ (compile-file ld #:output-file go))))))
(synopsis "The linker wrapper")
(description
"The linker wrapper (or @code{ld-wrapper}) wraps the linker to add any
@@ -676,8 +681,6 @@ the store.")
(home-page "https://www.gnu.org/software/guix//")
(license gpl3+)))
-(export make-ld-wrapper)
-
(define-public glibc
;; This is the GNU C Library, used on GNU/Linux and GNU/Hurd. Prior to
;; version 2.28, GNU/Hurd used a different glibc branch.
- 53/180: gnu: googletest: Update to 1.11.0., (continued)
- 53/180: gnu: googletest: Update to 1.11.0., guix-commits, 2021/10/29
- 59/180: Revert gstreamer update to 1.19.2., guix-commits, 2021/10/29
- 69/180: gnu: tensorflow: Enable parallel build (at least partially)., guix-commits, 2021/10/29
- 70/180: gnu: python-keras: Enable parallel tests., guix-commits, 2021/10/29
- 74/180: gnu: python-keras: Skip a flaky test., guix-commits, 2021/10/29
- 73/180: bluez: Update to 5.61., guix-commits, 2021/10/29
- 77/180: gnu: tzdata: Update to 2021e., guix-commits, 2021/10/29
- 81/180: build: qt-utils: Don't wrap .X-real files., guix-commits, 2021/10/29
- 82/180: gnu: curl: Honor #:tests?., guix-commits, 2021/10/29
- 83/180: gnu: gcc-5: Fix powerpc64le-linux build, guix-commits, 2021/10/29
- 84/180: gnu: make-ld-wrapper: Add a LINKER argument.,
guix-commits <=
- 86/180: gnu: gdb: Patch references to /bin/sh and add debug output., guix-commits, 2021/10/29
- 89/180: aux-files: sitecustomize: Cleanup and add explanatory comments., guix-commits, 2021/10/29
- 90/180: gnu: glade3: Remove sitecustomize.py workaround., guix-commits, 2021/10/29
- 49/180: gnu: e2fsprogs: Update to 1.46.4., guix-commits, 2021/10/29
- 58/180: gnu: polkit: Update to 0.120 and ungraft., guix-commits, 2021/10/29
- 63/180: gnu: gst-plugins-bad: Update to 1.18.5., guix-commits, 2021/10/29
- 80/180: gnu: diffutils: Update to 3.8., guix-commits, 2021/10/29
- 85/180: gnu: Add ld-gold-wrapper., guix-commits, 2021/10/29
- 79/180: gnu: diffutils: Fix signal processing., guix-commits, 2021/10/29
- 93/180: gnu: Build all Rust packages using the latest rustc., guix-commits, 2021/10/29