143/184: gnu: make-bootstrap: Slightly clarify 'package-with-relocatable-glibc'.

[guix-commits]

kkebreau pushed a commit to branch wip-gnome-updates
in repository guix.

commit 5126f32d43c272771bcdf6521239d92187706ea5
Author: Ludovic Courtès <address@hidden>
Date:   Sat Nov 9 22:28:04 2019 +0100

    gnu: make-bootstrap: Slightly clarify 'package-with-relocatable-glibc'.
    
    * gnu/packages/make-bootstrap.scm (package-with-relocatable-glibc)
    [cross-bootstrap-libc]: Take an explicit 'target' argument.  Remove
    redundant 'parameterize' form.
    [inputs, native-inputs]: Adjust accordingly.
---
 gnu/packages/make-bootstrap.scm | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm
index 4e6be32..b8d1b2a 100644
--- a/gnu/packages/make-bootstrap.scm
+++ b/gnu/packages/make-bootstrap.scm
@@ -125,19 +125,19 @@ for `sh' in $PATH, and without nscd, and with static NSS 
modules."
   "Return a variant of P that uses the libc as defined by
 `glibc-for-bootstrap'."
 
-  (define (cross-bootstrap-libc)
-    (let ((target (%current-target-system)))
-      (glibc-for-bootstrap
-       ;; `cross-libc' already returns a cross libc, so clear
-       ;; %CURRENT-TARGET-SYSTEM.
-       (parameterize ((%current-target-system #f))
-         (cross-libc target)))))
+  (define (cross-bootstrap-libc target)
+    (glibc-for-bootstrap
+     ;; `cross-libc' already returns a cross libc, so clear
+     ;; %CURRENT-TARGET-SYSTEM.
+     (parameterize ((%current-target-system #f))
+       (cross-libc target))))
 
   ;; Standard inputs with the above libc and corresponding GCC.
 
   (define (inputs)
     (if (%current-target-system)                ; is this package cross built?
-        `(("cross-libc" ,(cross-bootstrap-libc)))
+        `(("cross-libc"
+           ,(cross-bootstrap-libc (%current-target-system))))
         '()))
 
   (define (native-inputs)
@@ -146,7 +146,7 @@ for `sh' in $PATH, and without nscd, and with static NSS 
modules."
                (xgcc (cross-gcc
                       target
                       #:xbinutils (cross-binutils target)
-                      #:libc (cross-bootstrap-libc))))
+                      #:libc (cross-bootstrap-libc target))))
           `(("cross-gcc" ,(package
                             (inherit xgcc)
                             (search-paths