Update various tools

This commit includes updates of various tools used for building and testing StarlingMonkey:
- Binaryen
- Corrosion CMake Cargo integration
- wasm-tools
- Wasmtime
- Wizer

No changes in behavior should occur as a result of these updates.

Author: tschneidereit

cmake/binaryen.cmake

@@ -1,4 +1,4 @@
-set(BINARYEN_VERSION 117)
+set(BINARYEN_VERSION 118)
 
 set(BINARYEN_ARCH ${HOST_ARCH})
 if(HOST_OS STREQUAL "macos" AND HOST_ARCH STREQUAL "aarch64")

cmake/init-corrosion.cmake

@@ -2,14 +2,25 @@
 # NOTE: This file must not be called `corrosion.cmake`, because otherwise it'll be called recursively instead of the
 # same-named one coming with Corrosion.
 
-set(Rust_CARGO_TARGET wasm32-wasi)
 # Necessary to make cross-compiling to wasm32-wasi work for crates with -sys dependencies.
 set(Rust_CARGO_TARGET_LINK_NATIVE_LIBS "")
 
-file(STRINGS "${CMAKE_CURRENT_SOURCE_DIR}/rust-toolchain.toml" Rust_TOOLCHAIN REGEX "^channel ?=")
-string(REGEX MATCH "[0-9.]+" Rust_TOOLCHAIN "${Rust_TOOLCHAIN}")
-execute_process(COMMAND rustup toolchain install ${Rust_TOOLCHAIN})
-execute_process(COMMAND rustup target add --toolchain ${Rust_TOOLCHAIN} wasm32-wasi)
+# Parse Rust version and target from rust-toolchain.toml.
+file(READ "${CMAKE_CURRENT_SOURCE_DIR}/rust-toolchain.toml" RUST_TOOLCHAIN_FILE)
+if (NOT ${RUST_TOOLCHAIN_FILE} MATCHES [[channel *= *"([^\"]+)\"]])
+    message(FATAL_ERROR "Couldn't parse Rust toolchain version from file ${CMAKE_CURRENT_SOURCE_DIR}/rust-toolchain.toml")
+endif()
+set(Rust_TOOLCHAIN ${CMAKE_MATCH_1})
 
-CPMAddPackage("gh:corrosion-rs/corrosion#be76480232216a64f65e3b1d9794d68cbac6c690")
+if (NOT ${RUST_TOOLCHAIN_FILE} MATCHES [[targets = *\[ *"([^\"]+)]])
+    message(FATAL_ERROR "Couldn't parse Rust target from file ${CMAKE_CURRENT_SOURCE_DIR}/rust-toolchain.toml")
+endif()
+set(Rust_CARGO_TARGET ${CMAKE_MATCH_1})
+
+if (NOT Rust_VERSION VERSION_EQUAL ${Rust_TOOLCHAIN})
+    execute_process(COMMAND rustup toolchain install ${Rust_TOOLCHAIN})
+endif()
+execute_process(COMMAND rustup target add --toolchain ${Rust_TOOLCHAIN} ${Rust_CARGO_TARGET})
+
+CPMAddPackage("gh:corrosion-rs/corrosion#b45275c8b5ee16118008a6a140ce842557b3e47a")
 string(TOLOWER ${Rust_CARGO_HOST_ARCH} HOST_ARCH)

cmake/wasm-tools.cmake

@@ -1,6 +1,6 @@
-set(WASM_TOOLS_VERSION 1.0.54)
+set(WASM_TOOLS_VERSION 1.215.0)
 
-set(WASM_TOOLS_URL https://github.com/bytecodealliance/wasm-tools/releases/download/wasm-tools-${WASM_TOOLS_VERSION}/wasm-tools-${WASM_TOOLS_VERSION}-${HOST_ARCH}-${HOST_OS}.tar.gz)
+set(WASM_TOOLS_URL https://github.com/bytecodealliance/wasm-tools/releases/download/v${WASM_TOOLS_VERSION}/wasm-tools-${WASM_TOOLS_VERSION}-${HOST_ARCH}-${HOST_OS}.tar.gz)
 CPMAddPackage(NAME wasm-tools URL ${WASM_TOOLS_URL} DOWNLOAD_ONLY TRUE)
 set(WASM_TOOLS_DIR ${CPM_PACKAGE_wasm-tools_SOURCE_DIR})
 set(WASM_TOOLS_BIN ${WASM_TOOLS_DIR}/wasm-tools)

cmake/wasmtime.cmake

@@ -1,4 +1,4 @@
-set(WASMTIME_VERSION v19.0.2)
+set(WASMTIME_VERSION v23.0.1)
 set(WASMTIME_URL https://github.com/bytecodealliance/wasmtime/releases/download/${WASMTIME_VERSION}/wasmtime-${WASMTIME_VERSION}-${HOST_ARCH}-${HOST_OS}.tar.xz)
 CPMAddPackage(NAME wasmtime URL ${WASMTIME_URL} DOWNLOAD_ONLY TRUE)
 set(WASMTIME_DIR ${CPM_PACKAGE_wasmtime_SOURCE_DIR})

cmake/wizer.cmake

@@ -1,4 +1,4 @@
-set(WIZER_VERSION v3.0.1 CACHE STRING "Version of wizer to use")
+set(WIZER_VERSION v6.0.0 CACHE STRING "Version of wizer to use")
 
 set(WIZER_URL https://github.com/bytecodealliance/wizer/releases/download/${WIZER_VERSION}/wizer-${WIZER_VERSION}-${HOST_ARCH}-${HOST_OS}.tar.xz)
 CPMAddPackage(NAME wizer URL ${WIZER_URL} DOWNLOAD_ONLY TRUE)