From c67a20a329907aa77cac58fb023eb39cd3083f53 Mon Sep 17 00:00:00 2001 From: Ryan Lopopolo Date: Thu, 5 Aug 2021 06:20:52 -0700 Subject: [PATCH] Update rust-toolchain and emscripten-toolchain to LLVM 12 Artichoke only compiles with Rust 1.54.0. Rust 1.54.0 is based on LLVM 12 (rust-lang/rust#81451). To ensure the `emcc` compiled sources interop with Rust code, it is important to use an `emsdk` version that is ~close to when it was branched from LLVM 12. According to the release notes [0], 2.0.23 - 05/26/2021 release is the first to be based on LLVM 12. However, Rust depends on a stubbed function in the emsdk c++ ABI that was removed in 2.0.10. According to rust-lang/rust#85821, we might have luck compiling with 2.0.9 [0]: https://emscripten.org/docs/introducing_emscripten/release_notes.html emscripten-toolchain --- emscripten-toolchain | 2 +- rust-toolchain | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/emscripten-toolchain b/emscripten-toolchain index e170f4d8..3255b609 100644 --- a/emscripten-toolchain +++ b/emscripten-toolchain @@ -1 +1 @@ -1.39.20-upstream +2.0.9-upstream diff --git a/rust-toolchain b/rust-toolchain index ba0a7191..b7921ae8 100644 --- a/rust-toolchain +++ b/rust-toolchain @@ -1 +1 @@ -1.51.0 +1.54.0