summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPierre Langlois <pierre.langlois@gmx.com>2022-12-24 20:38:24 +0000
committerJonathan Brielmaier <jonathan.brielmaier@web.de>2023-02-21 22:05:09 +0100
commitaa13a54617d81ccba3630a5b93018443c9d4b711 (patch)
tree78afd560e51de45e61940b83e70ac4cd3124c20c
parent46b008f9058b506d4d48afce4dd5560feb0dfd21 (diff)
nongnu: wasm32-wasi-clang-runtime: Update to 15.
* nongnu/packages/wasm.scm (wasm32-wasi-clang-runtime): Update to 15. [native-inputs]: Use clang-15. [inputs]: Use llvm-15. [arguments]<#:configure-flags>: Adapt path to LLVM monorepo. Signed-off-by: Jonathan Brielmaier <jonathan.brielmaier@web.de>
-rw-r--r--nongnu/packages/wasm.scm10
1 files changed, 4 insertions, 6 deletions
diff --git a/nongnu/packages/wasm.scm b/nongnu/packages/wasm.scm
index f6fce54..be8cd94 100644
--- a/nongnu/packages/wasm.scm
+++ b/nongnu/packages/wasm.scm
@@ -67,11 +67,11 @@ other APIs.")
license:expat))))
(define-public wasm32-wasi-clang-runtime
- (package (inherit clang-runtime-13)
+ (package (inherit clang-runtime-15)
(native-inputs
- (list clang-13
+ (list clang-15
wasi-libc))
- (inputs (list llvm-13))
+ (inputs (list llvm-15))
(arguments
(list
#:build-type "Release"
@@ -94,9 +94,7 @@ other APIs.")
;; WASM only needs libclang_rt.builtins-wasm32.a from
;; compiler-rt.
- (string-append "../compiler-rt-"
- #$(package-version clang-runtime-13)
- ".src/lib/builtins"))))))
+ "../source/compiler-rt/lib/builtins")))))
;; FIXME: Ideally we wouldn't need to build a separate compiler because clang
;; can support multiple targets at runtime. However Guix patches the default