From aa13a54617d81ccba3630a5b93018443c9d4b711 Mon Sep 17 00:00:00 2001 From: Pierre Langlois Date: Sat, 24 Dec 2022 20:38:24 +0000 Subject: 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 --- nongnu/packages/wasm.scm | 10 ++++------ 1 file 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 -- cgit v1.2.3