hako pushed a commit to branch wip-zig-bootstrap
in repository guix.
commit c0c6d9afdfee2e89d1afb88028d5cd45983b5d75
Author: Hilton Chain <[email protected]>
AuthorDate: Mon Dec 30 23:14:18 2024 +0800
Revert "DRAFT gnu: zig: Bootstrap with x86_64-linux."
This reverts commit 2d3b191da4270b493dade629566a956529887235.
Change-Id: I1f459111a65ba80f46aef91c023a0ade217c1b22
---
gnu/packages/zig.scm | 22 +++-------------------
1 file changed, 3 insertions(+), 19 deletions(-)
diff --git a/gnu/packages/zig.scm b/gnu/packages/zig.scm
index 2d4361b007..f063afd614 100644
--- a/gnu/packages/zig.scm
+++ b/gnu/packages/zig.scm
@@ -20,7 +20,6 @@
;;; 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)
@@ -420,10 +419,7 @@ toolchain. Among other features it provides
(modify-inputs (package-native-inputs base)
(prepend binaryen)
(delete "glibc-abi-tool")))
- (outputs '("out" "zig1"))
- ;; XXX: This is to avoid UI warning, 32bit systems aren't really
- ;; supported at this point.
- (supported-systems %supported-systems))))
+ (outputs '("out" "zig1")))))
;; Supply zig1.wasm.zst, build zig2 + zig1.wasm, install zig2 + zig1.wasm.zst.
(define zig-0.10.0-675
@@ -1148,11 +1144,7 @@ toolchain. Among other features it provides
version commit
"0w412aka8wjkkwyssqg8nvzb7qwaa29ywzwhg11bbwkpqyig36r4"))
;; zig1
- (arguments
- (substitute-keyword-arguments (package-arguments zig-0.10.0-747)
- ((#:system _ #f)
- (match (%current-system)
- (_ "x86_64-linux")))))
+ (arguments (package-arguments zig-0.10.0-747))
(native-inputs
(modify-inputs (package-native-inputs base)
(replace "zig" `(,base "out")))))))
@@ -1236,7 +1228,6 @@ 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")))))
@@ -1522,11 +1513,7 @@ toolchain. Among other features it provides
version commit
"1yl91rpqsnlf38hg77phpl5hy7ds0cg57agr23hjhy50z4vdj3m4"))
;; zig1
- (arguments
- (substitute-keyword-arguments (package-arguments zig-0.10.0-747)
- ((#:system _ #f)
- (match (%current-system)
- (_ "x86_64-linux")))))
+ (arguments (package-arguments zig-0.10.0-747))
(native-inputs
(modify-inputs (package-native-inputs base)
(replace "zig" `(,base "out")))))))
@@ -1599,9 +1586,6 @@ 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.
