From 18b7fce25cf72b4c86b17af32c2ca094fa79b126 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 16 Nov 2024 23:16:36 +0200 Subject: [PATCH] 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 Modified-by: Hilton Chain Signed-off-by: Hilton Chain --- guix/build/zig-build-system.scm | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/guix/build/zig-build-system.scm b/guix/build/zig-build-system.scm index 93a5d915369984200bc6813bacc4741d938a68f2..90d1a644bbdc1335c9bdedd96ab9fa1c502b21f4 100644 --- a/guix/build/zig-build-system.scm +++ b/guix/build/zig-build-system.scm @@ -54,6 +54,24 @@ gcc_dir=") (close-port port)) (setenv "ZIG_LIBC" "/tmp/guix-zig-libc-paths")) +(define (zig-target target) + (cond + ((string=? target "i586-pc-gnu") + "x86-hurd-gnu") + ((string=? target "i686-linux-gnu") + "x86-linux-gnu") + ((string=? target "i686-w64-mingw32") + "x86-windows-gnu") + ((string=? target "mips64el-linux-gnu") + "mips64el-linux-gnuabi64") + ((string=? target "powerpc-linux-gnu") + "powerpc-linux-gnueabi") + ((string=? target "x86_64-pc-gnu") + "x86_64-hurd-gnu") + ((string=? target "x86_64-w64-mingw32") + "x86_64-windows-gnu") + (else target))) + (define* (build #:key zig-build-flags zig-release-type ;; "safe", "fast" or "small" empty for a @@ -69,7 +87,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))