22/58: gnu: commencement: gcc-mesboot0: Use Gash instead of coretutils&co.

[guix-commits]

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

commit e92b6986eead2289e812b40033a1bb01e2842514
Author: Jan Nieuwenhuizen <address@hidden>
AuthorDate: Fri Nov 22 16:16:59 2019 +0100

    gnu: commencement: gcc-mesboot0: Use Gash instead of coretutils&co.
    
    * gnu/packages/commencement.scm (gcc-mesboot0): Use Gash instead of
    coretutils&co.
    * gnu/packages/commencement.scm (%boot-mesboot0-inputs): New variable.
---
 gnu/packages/commencement.scm | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index c2d6d81..adeb6ed 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -1588,18 +1588,12 @@ BASH = ")))
   (package
     (inherit gcc-core-mesboot0)
     (name "gcc-mesboot0")
-    (native-inputs `(("binutils" ,binutils-mesboot0)
-
+    (native-inputs `(("boot-patch" ,(search-patch "gcc-boot-2.95.3.patch"))
                      ;; Packages are given in an order that's relevant for
                      ;; #include_next purposes.
                      ("libc" ,glibc-mesboot0)
                      ("kernel-headers" ,%bootstrap-linux-libre-headers)
-                     ("gcc" ,gcc-core-mesboot0)
-
-                     ("bash" ,%bootstrap-coreutils&co)
-                     ("coreutils" ,%bootstrap-coreutils&co)
-                     ("diffutils" ,diffutils-mesboot)
-                     ("make" ,make-mesboot0)))
+                     ,@(%boot-mesboot-core-inputs)))
     (arguments
      (substitute-keyword-arguments (package-arguments gcc-core-mesboot0)
        ((#:phases phases)
@@ -1618,11 +1612,11 @@ ac_cv_c_float_format='IEEE (little-endian)'
                (let* ((out (assoc-ref outputs "out"))
                       (gcc-dir (string-append
                                 out 
"/lib/gcc-lib/i686-unknown-linux-gnu/2.95.3")))
-                 (mkdir-p "tmp")
-                 (zero? (system (string-append "set -x; cd tmp && ar x 
../gcc/libgcc2.a")))
-                 (zero? (system (string-append "set -x; cd tmp && ar r " 
gcc-dir "/libgcc.a *.o")))
-                 (copy-file "gcc/libgcc2.a" (string-append out 
"/lib/libgcc2.a"))
-                 #t)))))
+                 (and
+                  (mkdir-p "tmp")
+                  (zero? (system (string-append "set -x; cd tmp && ar x 
../gcc/libgcc2.a")))
+                  (zero? (system (string-append "set -x; cd tmp && ar r " 
gcc-dir "/libgcc.a *.o")))
+                  (copy-file "gcc/libgcc2.a" (string-append out 
"/lib/libgcc2.a"))))))))
        ((#:configure-flags configure-flags)
         `(let ((out (assoc-ref %outputs "out")))
            `("--disable-shared"
@@ -1636,6 +1630,12 @@ ac_cv_c_float_format='IEEE (little-endian)'
              ,(string-append "LIBGCC2_INCLUDES=-I " gcc "/include")
              "LANGUAGES=c")))))))
 
+(define (%boot-mesboot0-inputs)
+  `(("gcc" ,gcc-mesboot0)
+    ("kernel-headers" ,%bootstrap-linux-libre-headers)
+    ("libc" ,glibc-mesboot0)
+    ,@(alist-delete "gcc" (%boot-mesboot-core-inputs))))
+
 (define binutils-mesboot
   (package
     (inherit binutils-mesboot0)