Skip to content

Commit ec28f53

Browse files
committed
Auto merge of #105395 - sunfishcode:sunfishcode/update-wasi, r=pietroalbini
Update the wasi toolchain. Update the WASI build to LLVM 15.0 and the wasi-libc version from [wasi-sdk-17]. This will require a ci-mirrors.rust-lang.org file load. Specifically, we need [this LLVM release tarball] uploaded to be downloadable from [this URL]. The biggest change in wasi-sdk-17 is that user exports no longer automatically run constructor functions. More details at: WebAssembly/WASI#493. [this LLVM release tarball]: https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.6/clang+llvm-15.0.6-x86_64-linux-gnu-ubuntu-18.04.tar.xz [this URL]: https://ci-mirrors.rust-lang.org/rustc/2022-12-06-clang%2Bllvm-15.0.6-x86_64-linux-gnu-ubuntu-18.04.tar.xz [wasi-sdk-17]: https://github.com/WebAssembly/wasi-sdk/releases/tag/wasi-sdk-17
2 parents e491d2b + 3e671fe commit ec28f53

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

src/ci/docker/host-x86_64/dist-various-2/build-wasi-toolchain.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22

33
set -ex
44

5-
# Originally from https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.0/clang+llvm-14.0.0-x86_64-linux-gnu-ubuntu-18.04.tar.xz
6-
curl https://ci-mirrors.rust-lang.org/rustc/2022-05-10-clang%2Bllvm-14.0.0-x86_64-linux-gnu-ubuntu-18.04.tar.xz | \
5+
# Originally from https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.6/clang+llvm-15.0.6-x86_64-linux-gnu-ubuntu-18.04.tar.xz
6+
curl https://ci-mirrors.rust-lang.org/rustc/2022-12-06-clang%2Bllvm-15.0.6-x86_64-linux-gnu-ubuntu-18.04.tar.xz | \
77
tar xJf -
8-
bin="$PWD/clang+llvm-14.0.0-x86_64-linux-gnu-ubuntu-18.04/bin"
8+
bin="$PWD/clang+llvm-15.0.6-x86_64-linux-gnu-ubuntu-18.04/bin"
99

1010
git clone https://github.com/WebAssembly/wasi-libc
1111

1212
cd wasi-libc
13-
git reset --hard 9886d3d6200fcc3726329966860fc058707406cd
13+
git reset --hard 8b7148f69ae241a2749b3defe4606da8143b72e0
1414
make -j$(nproc) \
1515
CC="$bin/clang" \
1616
NM="$bin/llvm-nm" \

0 commit comments

Comments
 (0)