124/176: gnu: gcc-core-mesboot: Revise dependencies.

[Jan Nieuwenhuizen]

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

commit f98e971b01f83f288a9c996af0f9e19682d2aec1
Author: Jan Nieuwenhuizen <address@hidden>
Date:   Thu Jul 12 20:44:31 2018 +0200

    gnu: gcc-core-mesboot: Revise dependencies.
    
    * gnu/packages/mes.scm (gcc-core-mesboot): Revise dependencies.
---
 gnu/packages/mes.scm | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm
index 0abc50a..7cec7a4 100644
--- a/gnu/packages/mes.scm
+++ b/gnu/packages/mes.scm
@@ -700,7 +700,11 @@ standard.")
                 (base32
                  "1xvfy4pqhrd5v2cv8lzf63iqg92k09g6z9n2ah6ndd4h17k1x0an"))))
      (supported-systems '("i686-linux"))
-     (native-inputs `(("binutils" ,binutils-mesboot0)
+     (inputs '())
+     (native-inputs `(("bootstrap-coreutils" ,%bootstrap-coreutils&co)
+                      ("binutils" ,binutils-mesboot0)
+                      ("diffutils-boot0" ,(@@ (gnu packages commencement) 
diffutils-boot0))
+                      ("make-boot0" ,(@@ (gnu packages commencement) 
gnu-make-boot0))
                       ("tcc" ,tcc-boot)))
      (outputs '("out"))
      (arguments
@@ -737,23 +741,16 @@ standard.")
                          (assoc-ref %build-inputs "binutils") "/bin"
                          ":" (assoc-ref %build-inputs "tcc") "/bin"
 
-                         ;; more bootstrap cheats
-                         ":" (assoc-ref %build-inputs "bash") "/bin"
-                         ":" (assoc-ref %build-inputs "coreutils") "/bin"
-                         ":" (assoc-ref %build-inputs "diffutils") "/bin"
-                         ":" (assoc-ref %build-inputs "file") "/bin"
-                         ":" (assoc-ref %build-inputs "grep") "/bin"
-                         ":" (assoc-ref %build-inputs "gzip") "/bin"
-                         ":" (assoc-ref %build-inputs "make") "/bin"
-                         ":" (assoc-ref %build-inputs "sed") "/bin"
-                         ":" (assoc-ref %build-inputs "tar") "/bin"))
+                         ":" (assoc-ref %build-inputs "bootstrap-coreutils") 
"/bin"
+                         ":" (assoc-ref %build-inputs "diffutils-boot0") "/bin"
+                         ":" (assoc-ref %build-inputs "make-boot0") "/bin"))
 
                 ;; no info at this stage
                 (delete-file-recursively "texinfo")
                 (system "touch gcc/cpp.info gcc/gcc.info")
 
                 (setenv "CONFIG_SHELL" (string-append
-                                        (assoc-ref %build-inputs "bash")
+                                        (assoc-ref %build-inputs 
"bootstrap-coreutils")
                                         "/bin/sh"))
                 (unsetenv "LANG")
                 (unsetenv "C_INCLUDE_PATH") ; flex