summaryrefslogtreecommitdiff
path: root/gnu/packages
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2017-01-20 22:57:47 +0100
committerLudovic Courtès <ludo@gnu.org>2017-01-20 22:57:47 +0100
commit168c400045bda767e9921789d93562c737b7b147 (patch)
tree6fb13b63bd9d5589f33da34fbd7a50414035ac67 /gnu/packages
parent677b30221b5c4413f7d9316ae4009dd393ef8214 (diff)
downloadpatches-168c400045bda767e9921789d93562c737b7b147.tar
patches-168c400045bda767e9921789d93562c737b7b147.tar.gz
gnu: ld-wrapper-boot0: Remove workaround for <http://bugs.gnu.org/24832>.
Fixes <http://bugs.gnu.org/24832>. * gnu/packages/commencement.scm (ld-wrapper-boot0): Change the first 'make-ld-wrapper' argument to "ld-wrapper-boot0"; change #:target to BOOT-TRIPLET.
Diffstat (limited to 'gnu/packages')
-rw-r--r--gnu/packages/commencement.scm12
1 files changed, 3 insertions, 9 deletions
diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index 273e3ca808..94b4d440ca 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2012, 2013, 2014, 2015, 2016 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2014 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2012 Nikita Karetnikov <nikita@karetnikov.org>
;;; Copyright © 2014, 2015 Mark H Weaver <mhw@netris.org>
@@ -447,14 +447,8 @@ the bootstrap environment."
(define ld-wrapper-boot0
;; We need this so binaries on Hurd will have libmachuser and libhurduser
;; in their RUNPATH, otherwise validate-runpath will fail.
- ;;
- ;; XXX: Work around <http://bugs.gnu.org/24832> by fixing the name and
- ;; triplet on GNU/Linux. For GNU/Hurd, use the right triplet.
- (make-ld-wrapper (string-append "ld-wrapper-" "x86_64-guix-linux-gnu")
- #:target (lambda (system)
- (if (string-suffix? "-linux" system)
- "x86_64-guix-linux-gnu"
- (boot-triplet system)))
+ (make-ld-wrapper "ld-wrapper-boot0"
+ #:target boot-triplet
#:binutils binutils-boot0
#:guile %bootstrap-guile
#:bash (car (assoc-ref %boot0-inputs "bash"))))