janneke pushed a commit to branch wip-arm-bootstrap
in repository guix.
commit 46c10bbd2155d19a7216669eb02154a2a1cf119b
Author: Jan (janneke) Nieuwenhuizen <[email protected]>
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
