diff options
author | John Kehayias <john.kehayias@protonmail.com> | 2024-01-07 21:27:27 -0500 |
---|---|---|
committer | John Kehayias <john.kehayias@protonmail.com> | 2024-01-07 21:27:27 -0500 |
commit | d9dee5ea2f564fa6979ae552fd9bd5ac22f86ecc (patch) | |
tree | 8d1b2f89808f9e7ddbeddeab7563f3ab82e533cd /guix/build/zig-build-system.scm | |
parent | ef4e4c9a2ccc1678182fa6e4409fff13c669fd14 (diff) | |
parent | 3de361d9c9d320aefbd43710124d7b07af891de1 (diff) |
Merge branch 'master' into mesa-updates
Change-Id: I0b92a95109688a1a4c50572bc25a4e5676e0921e
Diffstat (limited to 'guix/build/zig-build-system.scm')
-rw-r--r-- | guix/build/zig-build-system.scm | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/guix/build/zig-build-system.scm b/guix/build/zig-build-system.scm index d414ebfb17..8352a73324 100644 --- a/guix/build/zig-build-system.scm +++ b/guix/build/zig-build-system.scm @@ -47,6 +47,7 @@ zig-build-flags zig-release-type ;; "safe", "fast" or "small" empty for a ;; debug build" + target #:allow-other-keys) "Build a given Zig package." @@ -56,6 +57,9 @@ "--prefix-lib-dir" "lib" "--prefix-exe-dir" "bin" "--prefix-include-dir" "include" + ,@(if target + (list (string-append "-Dtarget=" target)) + '()) ,@(if zig-release-type (list (string-append "-Drelease-" zig-release-type)) '()) @@ -65,9 +69,10 @@ (define* (check #:key tests? zig-test-flags + target #:allow-other-keys) "Run all the tests" - (when tests? + (when (and tests? (not target)) (let ((old-destdir (getenv "DESTDIR"))) (setenv "DESTDIR" "test-out") ;; Avoid colisions with the build output (let ((call `("zig" "build" "test" |