182/207: gnu: binutils-mesboot0: Cleanup.

[Jan Nieuwenhuizen]

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

commit 5be9d4c557aefd0617c7993c1d1c999b5c423a93
Author: Jan Nieuwenhuizen <address@hidden>
Date:   Mon Sep 3 12:00:03 2018 +0200

    gnu: binutils-mesboot0: Cleanup.
    
    * gnu/packages/commencement.scm (binutils-mesboot0): Cleanup.
---
 gnu/packages/commencement.scm | 64 ++++++++++++-------------------------------
 1 file changed, 18 insertions(+), 46 deletions(-)

diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index b70f68b..be89ed3 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -672,6 +672,7 @@
     (propagated-inputs '())
     (native-inputs `(("tcc" ,tcc-boot)
 
+                     ("bash" ,%bootstrap-coreutils&co)
                      ("coreutils" ,%bootstrap-coreutils&co)
                      ("diffutils" ,diffutils-mesboot)
                      ("make" ,make-mesboot0)))
@@ -681,52 +682,23 @@
        #:guile ,%bootstrap-guile
        #:tests? #f                      ; runtest: command not found
        #:parallel-build? #f
-       #:strip-binaries? #f
-       #:make-flags '("AR=tcc -ar" "RANLIB=true")
-       #:phases
-       (modify-phases %standard-phases
-         (replace 'configure
-           (lambda* (#:key outputs #:allow-other-keys)
-             (let ((out (assoc-ref outputs "out"))
-                   (cppflags (string-append
-                              " -D __STDC__=1 "
-                              " -D __GLIBC_MINOR__=6"
-                              " -D MES_BOOTSTRAP=1")))
-               ;; who sets these?
-               (unsetenv "C_INCLUDE_PATH")
-               (unsetenv "CPLUS_INCLUDE_PATH")
-               (unsetenv "CPATH")
-               (unsetenv "LIBRARY_PATH")
-               (setenv "PATH"
-                       (string-append
-                        (assoc-ref %build-inputs "coreutils") "/bin"
-                        ":" (assoc-ref %build-inputs "make") "/bin"
-                        ":" (assoc-ref %build-inputs "tcc") "/bin"))
-
-               (format (current-error-port) "PATH=~a\n" (getenv "PATH"))
-               (setenv "CONFIG_SHELL" (string-append
-                                       (assoc-ref %build-inputs "coreutils")
-                                       "/bin/sh"))
-               (format (current-error-port) "CONFIG_SHELL=~a\n" (getenv 
"CONFIG_SHELL"))
-               (setenv "CPPFLAGS" cppflags)
-               (setenv "AR" "tcc -ar")
-               (setenv "CXX" "false")
-               (setenv "RANLIB" "true")
-               (setenv "CC" (string-append "tcc -static" " " cppflags))
-               (setenv "LD" (string-append "tcc -static" " " cppflags))
-               (setenv "CC_FOR_BUILD" (string-append "tcc -static" " " 
cppflags))
-               (setenv "CPP" (string-append "tcc -E" " " cppflags))
-               (setenv "CC_FOR_BUILD" (string-append "tcc -static" " " 
cppflags))
-               (setenv "OBJC" (string-append "tcc -static" " " cppflags))
-               (and (zero?
-                     (system* "./configure"
-                              "--disable-nls"
-                              "--disable-shared"
-                              "--disable-werror"
-                              "--build=i686-unknown-linux-gnu"
-                              "--host=i686-unknown-linux-gnu"
-                              "--with-sysroot=/"
-                              (string-append "--prefix=" out)))))))))))))
+       #:strip-binaries? #f             ; no strip yet
+       #:configure-flags
+       (let ((cppflags (string-append " -D __GLIBC_MINOR__=6"
+                                      " -D MES_BOOTSTRAP=1"))
+             (bash (assoc-ref %build-inputs "bash")))
+         `(,(string-append "CONFIG_SHELL=" bash "/bin/sh")
+           ,(string-append "CPPFLAGS=" cppflags)
+           "AR=tcc -ar"
+           "CXX=false"
+           "RANLIB=true"
+           ,(string-append "CC=tcc" cppflags)
+           "--disable-nls"
+           "--disable-shared"
+           "--disable-werror"
+           "--build=i686-unknown-linux-gnu"
+           "--host=i686-unknown-linux-gnu"
+           "--with-sysroot=/")))))))
 
 (define-public gcc-core-mesboot
   (package-with-bootstrap-guile