01/05: gnu: commencement: '%bootstrap-inputs+toolchain' no longer contains Mes.

[guix-commits]

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

commit 1380be3c73bb8734622df8972f80f9a5bfaf06dd
Author: Ludovic Courtès <address@hidden>
Date:   Mon Jun 17 12:10:24 2019 +0200

    gnu: commencement: '%bootstrap-inputs+toolchain' no longer contains Mes.
    
    * gnu/packages/commencement.scm (%bootstrap-inputs+toolchain): On
    i686-linux and x86_64-linux, remove "bootstrap-mescc-tools" and "mes"
    from %BOOTSTRAP-INPUTS.
---
 gnu/packages/commencement.scm | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index 13b813f..9a5f6b0 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -1388,15 +1388,16 @@ exec " gcc "/bin/" program
 (define (%bootstrap-inputs+toolchain)
   ;; The traditional bootstrap-inputs.  For the i686-linux Reduced Binary Seed
   ;; the actual reduced set with bootstrapped toolchain.
-  (append (match (%current-system)
-            ((or "i686-linux" "x86_64-linux")
-             `(("libc" ,glibc-mesboot)
-               ("binutils" ,binutils-mesboot)
-               ("gcc-wrapper" ,gcc-mesboot-wrapper)
-               ("gcc" ,gcc-mesboot)))
-            (_
-             '()))
-          (%bootstrap-inputs)))
+  (match (%current-system)
+    ((or "i686-linux" "x86_64-linux")
+     `(("libc" ,glibc-mesboot)
+       ("binutils" ,binutils-mesboot)
+       ("gcc-wrapper" ,gcc-mesboot-wrapper)
+       ("gcc" ,gcc-mesboot)
+       ,@(fold alist-delete (%bootstrap-inputs)
+               '("bootstrap-mescc-tools" "mes"))))
+    (_
+     (%bootstrap-inputs))))
 
 (define gnu-make-boot0
   (package-with-bootstrap-guile