01/01: gnu: ld-wrapper: Build with Guile 2.2.

[Ludovic Courtès]

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

commit 78dea6f1d4a85dd9571ccbd604239912ba3a18b8
Author: Ludovic Courtès <address@hidden>
Date:   Thu Apr 20 23:38:12 2017 +0200

    gnu: ld-wrapper: Build with Guile 2.2.
    
    Reported by Sergei Trofimovich <address@hidden>.
    
    * gnu/packages/base.scm (make-ld-wrapper): Change #:guile to default to
    GUILE-2.2.
    * gnu/packages/commencement.scm (ld-wrapper): Define in terms of
    'make-ld-wrapper' such that #:guile-for-build and #:guile are the same.
---
 gnu/packages/base.scm         |  2 +-
 gnu/packages/commencement.scm | 10 ++++------
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm
index d52c48d..4fd9ed8 100644
--- a/gnu/packages/base.scm
+++ b/gnu/packages/base.scm
@@ -442,7 +442,7 @@ included.")
 (define* (make-ld-wrapper name #:key
                           (target (const #f))
                           binutils
-                          (guile (canonical-package guile-2.0))
+                          (guile (canonical-package guile-2.2))
                           (bash (canonical-package bash))
                           (guile-for-build guile))
   "Return a package called NAME that contains a wrapper for the 'ld' program
diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index 09a82b6..baabb16 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -842,12 +842,10 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a 
\"address@hidden"~%"
 
 (define-public ld-wrapper
   ;; The final 'ld' wrapper, which uses the final Guile and Binutils.
-  (package (inherit ld-wrapper-boot3)
-    (name "ld-wrapper")
-    (inputs `(("guile" ,guile-final)
-              ("bash"  ,bash-final)
-              ,@(fold alist-delete (package-inputs ld-wrapper-boot3)
-                      '("guile" "bash"))))))
+  (make-ld-wrapper "ld-wrapper"
+                   #:binutils binutils-final
+                   #:guile guile-final
+                   #:bash bash-final))
 
 (define %boot5-inputs
   ;; Now with UTF-8 locales.  Remember that the bootstrap binaries were built