hako pushed a commit to branch wip-zig-bootstrap
in repository guix.
commit 2d3b191da4270b493dade629566a956529887235
Author: Hilton Chain <[email protected]>
AuthorDate: Mon Dec 30 12:59:39 2024 +0800
DRAFT gnu: zig: Bootstrap with x86_64-linux.
* gnu/packages/zig.scm (zig-0.10.0-3985,zig-0.11.0-3604,zig-0.12.0-109)
[arguments]<#:system>: Use x86_64-linux by default.
(zig-0.10.0-610,zig-0.11)[supported-systems]: Add back 32bit systems.
Change-Id: I3bd4b55f398937b1fd7db0e0f2dbffb2be85a9ab
---
gnu/packages/zig.scm | 22 +++++++++++++++++++---
1 file changed, 19 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/zig.scm b/gnu/packages/zig.scm
index f063afd614..2d4361b007 100644
--- a/gnu/packages/zig.scm
+++ b/gnu/packages/zig.scm
@@ -20,6 +20,7 @@
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (gnu packages zig)
+ #:use-module (ice-9 match)
#:use-module (guix gexp)
#:use-module (guix packages)
#:use-module (guix platform)
@@ -419,7 +420,10 @@ toolchain. Among other features it provides
(modify-inputs (package-native-inputs base)
(prepend binaryen)
(delete "glibc-abi-tool")))
- (outputs '("out" "zig1")))))
+ (outputs '("out" "zig1"))
+ ;; XXX: This is to avoid UI warning, 32bit systems aren't really
+ ;; supported at this point.
+ (supported-systems %supported-systems))))
;; Supply zig1.wasm.zst, build zig2 + zig1.wasm, install zig2 + zig1.wasm.zst.
(define zig-0.10.0-675
@@ -1144,7 +1148,11 @@ toolchain. Among other features it provides
version commit
"0w412aka8wjkkwyssqg8nvzb7qwaa29ywzwhg11bbwkpqyig36r4"))
;; zig1
- (arguments (package-arguments zig-0.10.0-747))
+ (arguments
+ (substitute-keyword-arguments (package-arguments zig-0.10.0-747)
+ ((#:system _ #f)
+ (match (%current-system)
+ (_ "x86_64-linux")))))
(native-inputs
(modify-inputs (package-native-inputs base)
(replace "zig" `(,base "out")))))))
@@ -1228,6 +1236,7 @@ toolchain. Among other features it provides
(replace "glibc-abi-tool" zig-0.11-glibc-abi-tool)
(replace "llvm" llvm-16)))
(outputs '("out" "zig1"))
+ (supported-systems %supported-systems)
(properties `((max-silent-time . 9600)
,@(clang-compiler-cpu-architectures "16")))))
@@ -1513,7 +1522,11 @@ toolchain. Among other features it provides
version commit
"1yl91rpqsnlf38hg77phpl5hy7ds0cg57agr23hjhy50z4vdj3m4"))
;; zig1
- (arguments (package-arguments zig-0.10.0-747))
+ (arguments
+ (substitute-keyword-arguments (package-arguments zig-0.10.0-747)
+ ((#:system _ #f)
+ (match (%current-system)
+ (_ "x86_64-linux")))))
(native-inputs
(modify-inputs (package-native-inputs base)
(replace "zig" `(,base "out")))))))
@@ -1586,6 +1599,9 @@ toolchain. Among other features it provides
;; zig1
(arguments
(substitute-keyword-arguments (package-arguments zig-0.10.0-747)
+ ((#:system _ #f)
+ (match (%current-system)
+ (_ "x86_64-linux")))
((#:phases phases '%standard-phases)
#~(modify-phases #$phases
;; Build errors when zig1.wasm is not found.
