05/07: bootstrap: Build the new reduced binary seed bootstrap on x86.

[guix-commits]

mhw pushed a commit to branch wip-binaries
in repository guix.

commit 6744cef5b033c60a388d1de9a6b08c917cc51a4c
Author: Mark H Weaver <address@hidden>
Date:   Mon Aug 12 17:43:03 2019 -0400

    bootstrap: Build the new reduced binary seed bootstrap on x86.
    
    * gnu/packages/make-bootstrap.scm (%bootstrap-tarballs)[inputs]: On 
i686-linux
    and x86_64-linux, substitute linux-libre-headers, Mes, and MesCC, in place 
of
    GCC, binutils, and glibc.
---
 gnu/packages/make-bootstrap.scm | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm
index cf9f8b4..d3b13d9 100644
--- a/gnu/packages/make-bootstrap.scm
+++ b/gnu/packages/make-bootstrap.scm
@@ -889,9 +889,15 @@ for `sh' in $PATH, and without nscd, and with static NSS 
modules."
                    %build-inputs)
          #t)))
     (inputs `(("guile-tarball" ,%guile-bootstrap-tarball)
-              ("gcc-tarball" ,%gcc-bootstrap-tarball)
-              ("binutils-tarball" ,%binutils-bootstrap-tarball)
-              ("glibc-tarball" ,(%glibc-bootstrap-tarball))
+              ,@(match (or (%current-target-system) (%current-system))
+                  ((or "i686-linux" "x86_64-linux")
+                   `(("bootstrap-mescc-tools" ,%mescc-tools-bootstrap-tarball)
+                     ("bootstrap-mes" ,%mes-bootstrap-tarball)
+                     ("bootstrap-linux-libre-headers"
+                      ,%linux-libre-headers-bootstrap-tarball)))
+                  (_ `(("gcc-tarball" ,%gcc-bootstrap-tarball)
+                       ("binutils-tarball" ,%binutils-bootstrap-tarball)
+                       ("glibc-tarball" ,(%glibc-bootstrap-tarball)))))
               ("coreutils&co-tarball" ,%bootstrap-binaries-tarball)))
     (synopsis "Tarballs containing all the bootstrap binaries")
     (description synopsis)