TakeV/guix
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

gnu: zig-0.10: Use gexp.

Browse source 
* gnu/packages/zig.scm (zig-0.10)[arguments]: Use gexp.

Change-Id: I8ba6a4bd92784637cd3a4448e2f99ed521a17f3a
This commit is contained in:
Hilton Chain 2023-10-23 22:20:01 +08:00
parent 282927e970
commit ca8dda2428
No known key found for this signature in database
GPG key ID: ACC66D09CA528292
1 changed files with 40 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

79
gnu/packages/zig.scm
View file

@ -20,6 +20,7 @@
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>. ;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (gnu packages zig) (define-module (gnu packages zig)
#:use-module (guix gexp)
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix utils) #:use-module (guix utils)
#:use-module (guix git-download) #:use-module (guix git-download)
@ -53,45 +54,45 @@ (define-public zig-0.10
(native-inputs (native-inputs
(list llvm-15)) (list llvm-15))
(arguments (arguments
`(#:configure-flags (list
(list ,@(if (%current-target-system) #:configure-flags
'(string-append "-DZIG_TARGET_TRIPLE=" #~(list #$@(if (%current-target-system)
(%current-target-system)) (list (string-append "-DZIG_TARGET_TRIPLE="
'()) (%current-target-system)))
(string-append "-DZIG_TARGET_MCPU=baseline") '())
"-DZIG_SHARED_LLVM=ON" "-DZIG_TARGET_MCPU=baseline"
(string-append "-DZIG_LIB_DIR=" (assoc-ref %outputs "out") "-DZIG_SHARED_LLVM=ON"
"/lib/zig")) (string-append "-DZIG_LIB_DIR=" #$output "/lib/zig"))
#:validate-runpath? #f ; TODO: zig binary can't find ld-linux. #:validate-runpath? #f ;TODO: zig binary can't find ld-linux.
#:out-of-source? #f ; for tests #:out-of-source? #f ;for tests
#:phases #:phases
(modify-phases %standard-phases #~(modify-phases %standard-phases
(add-after 'unpack 'set-env-variables (add-after 'unpack 'set-env-variables
(lambda* (#:key inputs native-inputs #:allow-other-keys) (lambda _
;; Set CC, since the stage 2 zig relies on it to find the libc ;; Set CC, since the stage 2 zig relies on it to find the libc
;; installation, and otherwise silently links against its own. ;; installation, and otherwise silently links against its own.
(setenv "CC" ,(cc-for-target)) (setenv "CC" #$(cc-for-target))
;; Set cache dir, otherwise Zig looks for `$HOME/.cache'. ;; Set cache dir, otherwise Zig looks for `$HOME/.cache'.
(setenv "ZIG_GLOBAL_CACHE_DIR" (setenv "ZIG_GLOBAL_CACHE_DIR"
(string-append (getcwd) "/zig-cache")))) (string-append (getcwd) "/zig-cache"))))
(add-after 'patch-source-shebangs 'patch-more-shebangs (add-after 'patch-source-shebangs 'patch-more-shebangs
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
;; Zig uses information about /usr/bin/env to determine the ;; Zig uses information about /usr/bin/env to determine the
;; version of glibc and other data. ;; version of glibc and other data.
(substitute* "lib/std/zig/system/NativeTargetInfo.zig" (substitute* "lib/std/zig/system/NativeTargetInfo.zig"
(("/usr/bin/env") (search-input-file inputs "/bin/env"))))) (("/usr/bin/env") (search-input-file inputs "/bin/env")))))
(delete 'check) (delete 'check)
(add-after 'install 'check (add-after 'install 'check
(lambda* (#:key outputs tests? #:allow-other-keys) (lambda* (#:key tests? #:allow-other-keys)
(when tests? (when tests?
(invoke (string-append (assoc-ref outputs "out") "/bin/zig") (invoke (string-append #$output "/bin/zig")
"build" "test" "build" "test"
;; We're not testing the compiler bootstrap chain. ;; We're not testing the compiler bootstrap chain.
"-Dskip-stage1" "-Dskip-stage1"
"-Dskip-stage2-tests" "-Dskip-stage2-tests"
;; Non-native tests try to link and execute non-native ;; Non-native tests try to link and execute non-native
;; binaries. ;; binaries.
"-Dskip-non-native"))))))) "-Dskip-non-native")))))))
(native-search-paths (native-search-paths
(list (list
(search-path-specification (search-path-specification