[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
58/60: build/zig: Adjust the build triplets for some systems.
From: |
guix-commits |
Subject: |
58/60: build/zig: Adjust the build triplets for some systems. |
Date: |
Mon, 18 Nov 2024 07:16:56 -0500 (EST) |
hako pushed a commit to branch wip-zig-bootstrap
in repository guix.
commit eb7b92f8e6644ba078c7cb2d556b96fb51762dcf
Author: Efraim Flashner <efraim@flashner.co.il>
AuthorDate: Sat Nov 16 23:16:36 2024 +0200
build/zig: Adjust the build triplets for some systems.
* guix/build/zig-build-system.scm (zig-target): New procedure.
(build): Use it to set the target when cross-compiling.
Change-Id: Ic82253ce899055526e894a0cb67738ddbb476574
---
guix/build/zig-build-system.scm | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/guix/build/zig-build-system.scm b/guix/build/zig-build-system.scm
index cacd6219c8..cb3015829b 100644
--- a/guix/build/zig-build-system.scm
+++ b/guix/build/zig-build-system.scm
@@ -56,6 +56,17 @@ gcc_dir=")
port)
(close-port port)))
+(define (zig-target target)
+ (cond ((string=? "i686-linux-gnu" target)
+ "x86-linux-gnu")
+ ((string=? "i586-pc-gnu" target)
+ "x86-hurd-gnu")
+ ((string=? "x86_64-w64-mingw32" target)
+ "x86_64-windows-gnu")
+ ((string=? "i686-w64-mingw32" target)
+ "x86-windows-gnu")
+ (else target)))
+
(define* (build #:key
zig-build-flags
zig-release-type ;; "safe", "fast" or "small" empty for a
@@ -71,7 +82,7 @@ gcc_dir=")
"--prefix-exe-dir" "bin"
"--prefix-include-dir" "include"
,@(if target
- (list (string-append "-Dtarget=" target))
+ (list (string-append "-Dtarget=" (zig-target target)))
'())
,@(if zig-release-type
(list (string-append "-Drelease-" zig-release-type))
- 06/60: gnu: Add zig-0.10.0-675., (continued)
- 06/60: gnu: Add zig-0.10.0-675., guix-commits, 2024/11/18
- 10/60: gnu: Add zig-0.10.0-851., guix-commits, 2024/11/18
- 17/60: gnu: Add zig-0.10.0-1506., guix-commits, 2024/11/18
- 49/60: gnu: Add zig-0.11.0-3501., guix-commits, 2024/11/18
- 48/60: gnu: Add zig-0.11.0-3344., guix-commits, 2024/11/18
- 42/60: gnu: Add zig-0.11.0-631., guix-commits, 2024/11/18
- 33/60: gnu: Add zig-0.10.0-3807., guix-commits, 2024/11/18
- 41/60: gnu: Add zig-0.11.0-587., guix-commits, 2024/11/18
- 55/60: gnu: Add zig-0.13., guix-commits, 2024/11/18
- 47/60: gnu: Add zig-0.11.0-3245., guix-commits, 2024/11/18
- 58/60: build/zig: Adjust the build triplets for some systems.,
guix-commits <=
- 04/60: gnu: zig-0.10: Fix lint warning., guix-commits, 2024/11/18
- 24/60: gnu: Add zig-0.10.0-1891., guix-commits, 2024/11/18
- 32/60: gnu: Add zig-0.10.0-3728., guix-commits, 2024/11/18
- 21/60: gnu: Add zig-0.10.0-1712., guix-commits, 2024/11/18
- 15/60: gnu: Add zig-0.10.0-1073., guix-commits, 2024/11/18
- 59/60: gnu: zig: Respect the PKG_CONFIG environment variable., guix-commits, 2024/11/18
- 19/60: gnu: Add zig-0.10.0-1657., guix-commits, 2024/11/18
- 51/60: gnu: Add zig-0.11.0-3506., guix-commits, 2024/11/18
- 37/60: gnu: Add zig-0.11., guix-commits, 2024/11/18
- 39/60: gnu: Add zig-0.11.0-384., guix-commits, 2024/11/18