gnu: %boot-mesboot1-inputs: Drop input labels.

* gnu/packages/commencement.scm
(%boot-mesboot1-inputs): Drop input labels.
(%boot-mesboot2-inputs): Inject former %boot-mesboot1-inputs for incremental
progress on input label removal.

Change-Id: Ice3cb78f81147647a08f26dbc39883f4fc2db6e1
Signed-off-by: Ludovic Courtès <ludo@gnu.org>

gnu/packages/commencement.scm

@@ -1271,17 +1271,11 @@ ac_cv_c_float_format='IEEE (little-endian)'
               (install-file "make" (string-append #$output "/bin")))))))))
 
 (define (%boot-mesboot1-inputs)
-  `(("binutils" ,binutils-mesboot1)
-    ("make" ,gnu-make-mesboot)
-    ("gcc" ,gcc-mesboot0)
-    ("kernel-headers" ,%bootstrap-linux-libre-headers)
-    ("libc" ,glibc-mesboot0)
-    ("gzip" ,gzip-mesboot)
-    ("patch" ,patch-mesboot)
-    ("bash" , gash-boot)               ;gnu-build-system used to expect "bash"
-    ("coreutils" , gash-utils-boot)
-    ("bootar" ,bootar)
-    ("guile" ,%bootstrap-guile)))
+  (cons* binutils-mesboot1
+         gnu-make-mesboot
+         (fold delete
+               (%boot-mesboot0-inputs)
+               (list binutils-mesboot0 gnu-make-mesboot0))))
 
 (define gmp-boot
   (let ((version "4.3.2"))
@@ -1484,7 +1478,16 @@ ac_cv_c_float_format='IEEE (little-endian)'
 
 (define (%boot-mesboot2-inputs)
   `(("gcc" ,gcc-mesboot1)
-    ,@(alist-delete "gcc" (%boot-mesboot1-inputs))))
+    ("binutils" ,binutils-mesboot1)
+    ("make" ,gnu-make-mesboot)
+    ("kernel-headers" ,%bootstrap-linux-libre-headers)
+    ("libc" ,glibc-mesboot0)
+    ("gzip" ,gzip-mesboot)
+    ("patch" ,patch-mesboot)
+    ("bash" , gash-boot)               ;gnu-build-system used to expect "bash"
+    ("coreutils" , gash-utils-boot)
+    ("bootar" ,bootar)
+    ("guile" ,%bootstrap-guile)))
 
 (define hello-mesboot
   ;; Check for Scheme-only bootstrap.  Note that newer versions of Hello