From 0a8051650b32d12804077965c0bf4ea25627e872 Mon Sep 17 00:00:00 2001 From: Pierre Langlois Date: Sat, 24 Dec 2022 20:39:45 +0000 Subject: [PATCH] nongnu: wasm32-wasi-libcxx: Update to 15. * nongnu/packages/wasm.scm (llvm-monorepo): New variable. (wasm32-wasi-libcxx): Update to 15. [source]: Use llvm-monorepo. Signed-off-by: Jonathan Brielmaier --- nongnu/packages/wasm.scm | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/nongnu/packages/wasm.scm b/nongnu/packages/wasm.scm index 8c5ef63..fa236d1 100644 --- a/nongnu/packages/wasm.scm +++ b/nongnu/packages/wasm.scm @@ -102,6 +102,7 @@ other APIs.") ;; upstream Guix's support for cross-compiling with clang. (define clang-from-llvm (@@ (gnu packages llvm) clang-from-llvm)) +(define llvm-monorepo (@@ (gnu packages llvm) llvm-monorepo)) (define-public wasm32-wasi-clang (let ((base (clang-from-llvm llvm-15 wasm32-wasi-clang-runtime))) @@ -125,17 +126,8 @@ other APIs.") (define-public wasm32-wasi-libcxx (package (name "wasm32-wasi-libcxx") - (version "13.0.0") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/llvm/llvm-project") - (commit (string-append "llvmorg-" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0cjl0vssi4y2g4nfr710fb6cdhxmn5r0vis15sf088zsc5zydfhw")))) + (version (package-version llvm-15)) + (source (llvm-monorepo version)) (build-system cmake-build-system) (arguments (list