52/54: bootstrap: %bootstrap-inputs+toolchain: Scheme-only bootstrap.

[guix-commits]

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

commit 8ab38d34a46bcab1f6bc2d95e9fe0f934f98da9c
Author: Jan Nieuwenhuizen <address@hidden>
Date:   Fri Nov 22 22:39:14 2019 +0100

    bootstrap: %bootstrap-inputs+toolchain: Scheme-only bootstrap.
    
    * gnu/packages/commencement.scm (%bootstrap-inputs+toolchain): Scheme-only
    bootstrap.
---
 gnu/packages/commencement.scm | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index 2dc7e16..f0a16b8 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -2636,16 +2636,26 @@ exec " gcc "/bin/" program
        #:tests? #f))))
 
 (define (%bootstrap-inputs+toolchain)
-  ;; The traditional bootstrap-inputs.  For the i686-linux Reduced Binary Seed
-  ;; the actual reduced set with bootstrapped toolchain.
+  ;; The traditional bootstrap-inputs.  For the i686-linux, x86_64-linux
+  ;; Scheme-only bootstrap the actual reduced set with bootstrapped toolchain.
   (match (%current-system)
     ((or "i686-linux" "x86_64-linux")
-     `(("libc" ,glibc-mesboot)
+     `(("bash" ,bash-mesboot)
+       ("bzip2" ,bzip2-mesboot0)
        ("binutils" ,binutils-mesboot)
+       ("coreutils" ,coreutils-mesboot)
+       ("diffutils" ,diffutils-mesboot)
+       ("gawk" ,gawk-mesboot)
        ("gcc-wrapper" ,gcc-mesboot-wrapper)
        ("gcc" ,gcc-mesboot)
-       ,@(fold alist-delete (%bootstrap-inputs)
-               '("bootstrap-mescc-tools" "mes"))))
+       ("grep" ,grep-mesboot)
+       ("gzip" ,gzip-mesboot0)
+       ("libc" ,glibc-mesboot)
+       ("make" ,make-mesboot)
+       ("patch" ,patch-mesboot0)
+       ("sed" ,sed-mesboot)
+       ("tar" ,tar-mesboot)
+       ("xz" ,xz-mesboot)))
     (_
      (%bootstrap-inputs))))