[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: |
Tue, 19 Nov 2024 08:13:06 -0500 (EST) |
hako pushed a commit to branch wip-zig-bootstrap
in repository guix.
commit cbb44fcaf307899c69c5d8c87c35d9a9751be21f
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 302d096976..fe9a0d68d4 100644
--- a/guix/build/zig-build-system.scm
+++ b/guix/build/zig-build-system.scm
@@ -52,6 +52,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
@@ -67,7 +78,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))
- 12/60: gnu: Add zig-0.10.0-961., (continued)
- 12/60: gnu: Add zig-0.10.0-961., guix-commits, 2024/11/19
- 01/60: gnu: zig: Add 'zig-source' procedure., guix-commits, 2024/11/19
- 02/60: gnu: zig-0.9: Update patches., guix-commits, 2024/11/19
- 09/60: gnu: Add zig-0.10.0-748., guix-commits, 2024/11/19
- 27/60: gnu: Add zig-0.10.0-2571., guix-commits, 2024/11/19
- 22/60: gnu: Add zig-0.10.0-1713., guix-commits, 2024/11/19
- 26/60: gnu: Add zig-0.10.0-2566., guix-commits, 2024/11/19
- 17/60: gnu: Add zig-0.10.0-1506., guix-commits, 2024/11/19
- 15/60: gnu: Add zig-0.10.0-1073., guix-commits, 2024/11/19
- 14/60: gnu: Add zig-0.10.0-1027., guix-commits, 2024/11/19
- 58/60: build/zig: Adjust the build triplets for some systems.,
guix-commits <=
- 47/60: gnu: Add zig-0.11.0-3245., guix-commits, 2024/11/19
- 34/60: gnu: Add zig-0.10.0-3813., guix-commits, 2024/11/19
- 57/60: build-system: zig: Support cross compilation., guix-commits, 2024/11/19
- 40/60: gnu: Add zig-0.11.0-494., guix-commits, 2024/11/19
- 49/60: gnu: Add zig-0.11.0-3501., guix-commits, 2024/11/19
- 07/60: gnu: Add zig-0.10.0-722., guix-commits, 2024/11/19
- 44/60: gnu: Add zig-0.11.0-702., guix-commits, 2024/11/19
- 11/60: gnu: Add zig-0.10.0-853., guix-commits, 2024/11/19
- 52/60: gnu: Add zig-0.11.0-3604., guix-commits, 2024/11/19
- 43/60: gnu: Add zig-0.11.0-638., guix-commits, 2024/11/19