Skip to content

Commit 9f0c6bb

Browse files
wasi-sdk: upgrade 29 -> 31
Changelog: 31: Add experimental support for C++ exceptions Update wasm-component-ld in CI Update wasm-component-ld Update to LLVM 22.1.0 Build wasip3 target Include libclang.so in wasi-sdk Update wasi-libc submodule Build LLDB as part of wasi-sdk Adjust documentation of limitations in README Change Clang's default target to wasm32-wasip1 Update wasi-libc Update wasi-libc one more time 30: Update wasm-component-ld Update wasi-libc to cmake-enabled build Update wasi-libc with sdk version information doc: add cargo to list of requirements Update wasi-libc Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com>
1 parent bf39dcd commit 9f0c6bb

File tree

6 files changed

+9
-10
lines changed

6 files changed

+9
-10
lines changed

meta-firefox/classes/mozilla.bbclass

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ export MOZBUILD_STATE_PATH = "${S}/mozbuild_state"
3131
export OUT_DIR = "${S}/build/target/release/deps"
3232
export WASI_SYSROOT = "${STAGING_DATADIR_NATIVE}/wasi-sysroot"
3333

34-
export WASM_CC = "${WASI_SYSROOT}/bin/clang -target wasm32-wasi "
35-
export WASM_CXX = "${WASI_SYSROOT}/bin/clang++ -target wasm32-wasi "
34+
export WASM_CC = "${WASI_SYSROOT}/bin/clang -target wasm32-wasip1 "
35+
export WASM_CXX = "${WASI_SYSROOT}/bin/clang++ -target wasm32-wasip1 "
3636

3737
export BUILD_VERBOSE_LOG = "1"
3838

meta-firefox/recipes-devtools/wasi-sdk/files/0001-don-t-build-wasm-component-ld.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@ diff --git a/cmake/wasi-sdk-toolchain.cmake b/cmake/wasi-sdk-toolchain.cmake
1616
index 61481e3..f68d288 100644
1717
--- a/cmake/wasi-sdk-toolchain.cmake
1818
+++ b/cmake/wasi-sdk-toolchain.cmake
19-
@@ -116,26 +116,6 @@ install(DIRECTORY ${wasi_tmp_install}/bin ${wasi_tmp_install}/lib ${wasi_tmp_ins
19+
@@ -193,26 +193,6 @@ install(DIRECTORY ${wasi_tmp_install}/bin ${wasi_tmp_install}/lib ${wasi_tmp_ins
2020
USE_SOURCE_PERMISSIONS
2121
DESTINATION ${CMAKE_INSTALL_PREFIX})
2222

2323
-# Build logic for `wasm-component-ld` installed from Rust code.
2424
-set(wasm_component_ld_root ${CMAKE_CURRENT_BINARY_DIR}/wasm-component-ld)
2525
-set(wasm_component_ld ${wasm_component_ld_root}/bin/wasm-component-ld${CMAKE_EXECUTABLE_SUFFIX})
26-
-set(wasm_component_ld_version 0.5.19)
26+
-set(wasm_component_ld_version 0.5.21)
2727
-if(RUST_TARGET)
2828
- set(rust_target_flag --target=${RUST_TARGET})
2929
-endif()

meta-firefox/recipes-devtools/wasi-sdk/files/0001-don-t-strip-symbols-from-binaries.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ diff --git a/cmake/wasi-sdk-toolchain.cmake b/cmake/wasi-sdk-toolchain.cmake
1919
index 61481e3..5f04af4 100644
2020
--- a/cmake/wasi-sdk-toolchain.cmake
2121
+++ b/cmake/wasi-sdk-toolchain.cmake
22-
@@ -90,9 +90,6 @@ ExternalProject_Add(llvm-build
23-
-DLLVM_DEFAULT_TARGET_TRIPLE=wasm32-wasi
22+
@@ -166,9 +166,6 @@ ExternalProject_Add(llvm-build
23+
-DLLVM_DEFAULT_TARGET_TRIPLE=wasm32-wasip1
2424
-DLLVM_INSTALL_BINUTILS_SYMLINKS=TRUE
2525
-DLLVM_ENABLE_LIBXML2=OFF
2626
- # Pass `-s` to strip symbols by default and shrink the size of the

meta-firefox/recipes-devtools/wasi-sdk/wasi-sdk-sysroot-native_29.bb renamed to meta-firefox/recipes-devtools/wasi-sdk/wasi-sdk-sysroot-native_31.bb

File renamed without changes.

meta-firefox/recipes-devtools/wasi-sdk/wasi-sdk-toolchain-native_29.bb renamed to meta-firefox/recipes-devtools/wasi-sdk/wasi-sdk-toolchain-native_31.bb

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,5 @@ require wasi-sdk.inc
77
EXTRA_OECMAKE += "-DWASI_SDK_BUILD_TOOLCHAIN=ON -DCMAKE_INSTALL_PREFIX:PATH=${datadir}/wasi-sysroot"
88

99
do_install:append(){
10-
ln -s ../../../lib/libedit.so.0 ${D}${datadir}/wasi-sysroot/lib/libedit.so.0
11-
ln -s ../../../lib/libtinfo.so.5 ${D}${datadir}/wasi-sysroot/lib/libtinfo.so.5
10+
sed -i 's,prefix=${B}.*,prefix=${datadir}/wasi-sysroot,' ${D}${datadir}/wasi-sysroot/lib/pkgconfig/libedit.pc
1211
}

meta-firefox/recipes-devtools/wasi-sdk/wasi-sdk.inc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ SRC_URI = "gitsm://github.com/WebAssembly/wasi-sdk.git;protocol=https;branch=mai
1616
file://0001-don-t-build-wasm-component-ld.patch \
1717
file://0001-don-t-strip-symbols-from-binaries.patch"
1818

19-
SRCREV = "338aec5def0debda9de7e47838c9883e4e0d923f"
19+
SRCREV = "2e6b578a6986005e29e01c10b94843fdb2a76f0a"
2020

2121
TOOLCHAIN = "clang"
2222
TOOLCHAIN:class-native = "clang"
@@ -27,4 +27,4 @@ RUNTIME:class-native = "llvm"
2727
FILES:${PN} = "${datadir}/wasi-sysroot/*"
2828

2929
# this needs manual updating
30-
WASI_CLANG_VERSION = "21"
30+
WASI_CLANG_VERSION = "22"

0 commit comments

Comments
 (0)