01/03: squash! commencement: tcc-boot: Support ARM.

[guix-commits]

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

commit 5e8a9e340647e39acb52ee2b57cfee536660682b
Author: Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
AuthorDate: Sun Jan 10 14:41:06 2021 +0100

    squash! commencement: tcc-boot: Support ARM.
    
    * gnu/packages/commencement.scm (tcc-boot)[arguments]: For ARM, also rebuild
    libc.a.
---
 gnu/packages/commencement.scm | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index 900da87..d93f0fd 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -1005,9 +1005,19 @@ $MES -e '(mescc)' module/mescc.scm -- \"$@\"
                       (delete-file (string-append out 
"/lib/tcc/libtcc1-mes.a"))
                       (apply invoke "./tcc" "-c" "-o" "libtcc1-mes.o"
                              (string-append mes "/lib/libtcc1.c") cppflags)
-                      (invoke "./tcc" "-ar" "rc" "libtcc1-mes.a" 
"libtcc1-mes.o" "armeabi.o")
+                      (invoke "./tcc" "-ar" "rc" "libtcc1-mes.a"
+                              "libtcc1-mes.o" "armeabi.o")
                       (copy-file "libtcc1-mes.a"
-                                 (string-append out 
"/lib/tcc/libtcc1-mes.a"))))
+                                 (string-append out "/lib/tcc/libtcc1-mes.a"))
+
+                      (delete-file (string-append out "/lib/libc.a"))
+                      (apply invoke "./tcc" "-c" "-o" "libc.o"
+                             "-I" (string-append tcc "/include")
+                             "-I" (string-append tcc "/include/linux/arm")
+                             (string-append mes "/lib/libc+gnu.c")
+                             cppflags)
+                      (invoke "./tcc" "-ar" "rc" "libc.a" "libc.o")
+                      (copy-file "libc.a" (string-append out "/lib/libc.a"))))
                    ((or "i686-linux" "x86_64-linux")
                     '((delete-file           (string-append out 
"/lib/tcc/libtcc1.a"))
                       (apply invoke "./tcc" "-c" "-o" "libtcc1.o" 
"lib/libtcc1.c" cppflags)