diff options
| author | Liliana Marie Prikler <liliana.prikler@gmail.com> | 2023-07-23 10:11:29 +0200 |
|---|---|---|
| committer | Liliana Marie Prikler <liliana.prikler@gmail.com> | 2023-07-23 10:11:29 +0200 |
| commit | 4c204d01d57ac7da11a5772d5d4e3254d1c2408f (patch) | |
| tree | c7e5cb013abc742734acd9613674df4ebddfdeef /gnu/packages/zig.scm | |
| parent | 82bdb77082fa4e100761f70086b745dfb280c3ac (diff) | |
| parent | 445a0359083388b5ee686e6e855f94a3aac5f79c (diff) | |
Merge branch 'master' into gnome-team
Diffstat (limited to 'gnu/packages/zig.scm')
| -rw-r--r-- | gnu/packages/zig.scm | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/gnu/packages/zig.scm b/gnu/packages/zig.scm index c2f92e04e7..dcca9a1121 100644 --- a/gnu/packages/zig.scm +++ b/gnu/packages/zig.scm @@ -136,7 +136,8 @@ toolchain. Among other features it provides (file-name (git-file-name name version)) (sha256 (base32 "0nfvgg23sw50ksy0z0ml6lkdsvmd0278mq29m23dbb2jsirkhry7")) - (patches (search-patches "zig-use-system-paths.patch" + (patches (search-patches "zig-0.9-riscv-support.patch" + "zig-use-system-paths.patch" "zig-do-not-link-against-librt.patch")))) (inputs (list clang-13 ; Clang propagates llvm. @@ -151,6 +152,9 @@ toolchain. Among other features it provides (%current-target-system)) '())) #:out-of-source? #f ; for tests + ;; There are too many unclear test failures. + #:tests? ,(not (or (target-riscv64?) + (%current-target-system))) #:phases (modify-phases %standard-phases (add-after 'configure 'set-cache-dir @@ -158,6 +162,22 @@ toolchain. Among other features it provides ;; Set cache dir, otherwise Zig looks for `$HOME/.cache'. (setenv "ZIG_GLOBAL_CACHE_DIR" (string-append (getcwd) "/zig-cache")))) + ,@(if (target-riscv64?) + ;; It is unclear why all these tests fail to build. + `((add-after 'unpack 'adjust-tests + (lambda _ + (substitute* "build.zig" + ((".*addRuntimeSafetyTests.*") "") + ((".*addRunTranslatedCTests.*") "")) + (substitute* "test/standalone.zig" + ;; These tests fail to build on riscv64-linux. + ;; They both contain 'exe.linkSystemLibrary("c");' + ((".*shared_library.*") "") + ((".*mix_o_files.*") "") + ;; ld.lld: error: undefined symbol: __tls_get_addr + ;; Is this symbol x86 only in glibc? + ((".*link_static_lib_as_system_lib.*") ""))))) + '()) (delete 'check) (add-after 'install 'check (lambda* (#:key outputs tests? #:allow-other-keys) |