179/210: gnu: tcc-boot: Cleanup.

[Jan Nieuwenhuizen]

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

commit ecc3a11e3be9f770df8f86ef33a9a09bb6f24298
Author: Jan Nieuwenhuizen <address@hidden>
Date:   Mon Sep 3 13:27:35 2018 +0200

    gnu: tcc-boot: Cleanup.
    
    * gnu/packages/commencement.scm (tcc-boot): Cleanup.
---
 gnu/packages/commencement.scm | 58 +++++++++++++++++++++----------------------
 1 file changed, 29 insertions(+), 29 deletions(-)

diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index 40c44da..8188333 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -505,14 +505,14 @@
                                 coreutils "/bin"
                                 ":" tcc "/bin"))
                 (format (current-error-port) "PATH=~s\n" (getenv "PATH"))
-                (zero? (system* "sh" "configure"
-                                (string-append "--cc=tcc")
-                                (string-append "--cpu=i386")
-                                (string-append "--prefix=" out)
-                                (string-append "--elfinterp=" interpreter)
-                                (string-append "--crtprefix=" tcc "/lib")
-                                (string-append "--sysincludepaths=" tcc 
"/include")
-                                (string-append "--libpaths=" tcc "/lib"))))))
+                (invoke "sh" "configure"
+                        (string-append "--cc=tcc")
+                        (string-append "--cpu=i386")
+                        (string-append "--prefix=" out)
+                        (string-append "--elfinterp=" interpreter)
+                        (string-append "--crtprefix=" tcc "/lib")
+                        (string-append "--sysincludepaths=" tcc "/include")
+                        (string-append "--libpaths=" tcc "/lib")))))
           (replace 'build
             (lambda* (#:key outputs #:allow-other-keys)
               (let* ((out (assoc-ref %outputs "out"))
@@ -522,24 +522,24 @@
                      (interpreter (if libc
                                       (string-append libc 
,(glibc-dynamic-linker))
                                       (string-append mes "/lib/mes-loader"))))
-                (zero? (system* "tcc"
-                                "-vvv"
-                                "-D" "BOOTSTRAP=1"
-                                "-D" "ONE_SOURCE=1"
-                                "-D" "TCC_TARGET_I386=1"
-                                "-D" "CONFIG_TCC_STATIC=1"
-                                "-D" "CONFIG_USE_LIBGCC=1"
-                                "-D" (string-append "CONFIG_TCCDIR=\"" out 
"/lib/tcc\"")
-                                "-D" (string-append "CONFIG_TCC_CRTPREFIX=\"" 
out "/lib:{B}/lib:.\"")
-                                "-D" (string-append "CONFIG_TCC_CRTPREFIX=\"" 
out "/lib:{B}/lib:.\"")
-                                "-D" (string-append "CONFIG_TCC_ELFINTERP=\"" 
interpreter "\"")
-                                "-D" (string-append "CONFIG_TCC_LIBPATHS=\"" 
tcc "/lib:{B}/lib:.\"")
-                                "-D" (string-append 
"CONFIG_TCC_SYSINCLUDEPATHS=\"" tcc "/include" ":/include:{B}/include\"")
-                                "-D" (string-append "TCC_LIBGCC=\"" tcc 
"/lib/libc.a\"")
-                                "-o" "tcc"
-                                "tcc.c")))))
+                (invoke "tcc"
+                        "-vvv"
+                        "-D" "BOOTSTRAP=1"
+                        "-D" "ONE_SOURCE=1"
+                        "-D" "TCC_TARGET_I386=1"
+                        "-D" "CONFIG_TCC_STATIC=1"
+                        "-D" "CONFIG_USE_LIBGCC=1"
+                        "-D" (string-append "CONFIG_TCCDIR=\"" out 
"/lib/tcc\"")
+                        "-D" (string-append "CONFIG_TCC_CRTPREFIX=\"" out 
"/lib:{B}/lib:.\"")
+                        "-D" (string-append "CONFIG_TCC_CRTPREFIX=\"" out 
"/lib:{B}/lib:.\"")
+                        "-D" (string-append "CONFIG_TCC_ELFINTERP=\"" 
interpreter "\"")
+                        "-D" (string-append "CONFIG_TCC_LIBPATHS=\"" tcc 
"/lib:{B}/lib:.\"")
+                        "-D" (string-append "CONFIG_TCC_SYSINCLUDEPATHS=\"" 
tcc "/include" ":/include:{B}/include\"")
+                        "-D" (string-append "TCC_LIBGCC=\"" tcc 
"/lib/libc.a\"")
+                        "-o" "tcc"
+                        "tcc.c"))))
           (replace 'check
-            (lambda* (#:key outputs #:allow-other-keys)
+            (lambda _
               ;; FIXME: add sensible check target (without depending on make)
               ;; ./check.sh ?
               (= 1 (status:exit-val (system* "./tcc" "--help")))))
@@ -555,12 +555,12 @@
                                    (string-append out "/include"))
                  (copy-recursively (string-append tcc "/lib")
                                    (string-append out "/lib"))
-                 (zero? (system* "tcc" "-D" "TCC_TARGET_I386=1" "-c" "-o" 
"libtcc1.o" "lib/libtcc1.c"))
-                 (zero? (system* "tcc" "-ar" "rc" "libtcc1.a" "libtcc1.o"))
+                 (invoke "tcc" "-D" "TCC_TARGET_I386=1" "-c" "-o" "libtcc1.o" 
"lib/libtcc1.c")
+                 (invoke "tcc" "-ar" "rc" "libtcc1.a" "libtcc1.o")
                  (copy-file "libtcc1.a" (string-append out "/lib/libtcc1.a"))
                  (delete-file (string-append out "/lib/tcc/libtcc1.a"))
-                 (copy-file "libtcc1.a" (string-append out 
"/lib/tcc/libtcc1.a"))))))))))))
-
+                 (copy-file "libtcc1.a" (string-append out 
"/lib/tcc/libtcc1.a"))
+                 #t))))))))))
 
 (define-public make-mesboot0
   (package-with-bootstrap-guile