05/26: bootstrap: mescc-tools: Support ARM, update to 0.7.0.

[guix-commits]

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

commit b0f2c45bc1af31b7ab3104d673ef867cb4cc9f23
Author: Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
AuthorDate: Sun Dec 13 22:47:18 2020 +0100

    bootstrap: mescc-tools: Support ARM, update to 0.7.0.
    
    * gnu/packages/make-bootstrap.scm (%mescc-tools-static): Inherit from
    mescc-tools; updating to 0.7.0.
    [arguments]: Support armhf-linux, aarch64-linux.  Update make-flags to 
really
    build static.
---
 gnu/packages/make-bootstrap.scm | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm
index b2d3e2a..195ea22 100644
--- a/gnu/packages/make-bootstrap.scm
+++ b/gnu/packages/make-bootstrap.scm
@@ -589,13 +589,16 @@ for `sh' in $PATH, and without nscd, and with static NSS 
modules."
 (define %mescc-tools-static
   ;; A statically linked MesCC Tools.
   (package
-    (inherit mescc-tools-0.5.2)
+    (inherit mescc-tools)
     (name "mescc-tools-static")
     (arguments
-     `(#:system "i686-linux"
+     `(#:system ,(match (%current-system)
+                   ((or "i686-linux" "x86_64-linux") "i686-linux")
+                   ((or "armhf-linux" "aarch64-linux") "armhf-linux"))
        ,@(substitute-keyword-arguments (package-arguments mescc-tools)
            ((#:make-flags flags)
-            `(cons "CC=gcc -static" ,flags)))))))
+            '(list (string-append "PREFIX=" (assoc-ref %outputs "out"))
+                   "CC=gcc -static")))))))
 
 ;; ... next remove store references.
 (define %mescc-tools-static-stripped