02/02: gnu: ld-wrapper-boot0: Remove workaround for <http://bugs.gnu.org/24832>.

[Ludovic Courtès]

civodul pushed a commit to branch core-updates
in repository guix.

commit 168c400045bda767e9921789d93562c737b7b147
Author: Ludovic Courtès <address@hidden>
Date:   Fri Jan 20 22:57:47 2017 +0100

    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.
---
 gnu/packages/commencement.scm |   12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index 273e3ca..94b4d44 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 <address@hidden>
+;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017 Ludovic Courtès 
<address@hidden>
 ;;; Copyright © 2014 Andreas Enge <address@hidden>
 ;;; Copyright © 2012 Nikita Karetnikov <address@hidden>
 ;;; Copyright © 2014, 2015 Mark H Weaver <address@hidden>
@@ -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"))))