175/210: gnu: glibc-mesboot: Remove %bootstrap-glibc.

[Jan Nieuwenhuizen]

janneke pushed a commit to branch wip-bootstrap
in repository guix.

commit 1e4601ef00383b2e83c985c2ff0961ff1f52c4ce
Author: Jan Nieuwenhuizen <address@hidden>
Date:   Mon Sep 3 00:41:38 2018 +0200

    gnu: glibc-mesboot: Remove %bootstrap-glibc.
    
    * gnu/packages/commencement.scm (gcc-mesboot-wrapper)[i686-linux]: Use 
glibc-mesboot.
    (gnu-make-boot0): Likewise.
---
 gnu/packages/commencement.scm | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index 35a0fa9..5e1b0f8 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -1394,7 +1394,8 @@ ac_cv_c_float_format='IEEE (little-endian)'
      (source #f)
      (inputs '())
      (native-inputs `(("bash" ,%bootstrap-coreutils&co)
-                      ("libc" ,%bootstrap-glibc)
+                      ;;("libc" ,%bootstrap-glibc)
+                      ("libc" ,glibc-mesboot)
                       ("gcc" ,gcc-mesboot)))
      (arguments
       `(#:implicit-inputs? #f
@@ -1709,10 +1710,8 @@ exec " gcc "/bin/" program
 
 (define (%bootstrap-inputs+toolchain)
   (append (match (%current-system)
-            ("i686-linux" `(;;("libc" ,glibc-mesboot) ; FIXME: make usable for 
unpatched gnu-make-boot0, *-boot0
-                            ("libc" ,%bootstrap-glibc)
+            ("i686-linux" `(("libc" ,glibc-mesboot)
                             ("binutils" ,binutils-mesboot)
-                            ;; ("gcc" ,gcc-mesboot)   ; FIXME: allow gcc to 
use glibc
                             ("gcc" ,gcc-mesboot-wrapper)))
             (_ '()))
           %bootstrap-inputs))