Skip to content

Commit 1e8cd63

Browse files
committed
Auto merge of rust-lang#96907 - sunfishcode:sunfishcode/update-wasi, r=Mark-Simulacrum
Update the wasi toolchain. Update the WASI build to LLVM 14.0 and the wasi-libc version from wasi-sdk-15. 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]. [this LLVM release tarball]: 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 [this URL]: https://ci-mirrors.rust-lang.org/rustc/2022-05-10-clang%2Bllvm-14.0.0-x86_64-linux-gnu-ubuntu-18.04.tar.xz
2 parents c1d65ea + 4cc0cc7 commit 1e8cd63

File tree

1 file changed

+10
-5
lines changed

1 file changed

+10
-5
lines changed

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

+10-5
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,21 @@
22

33
set -ex
44

5-
# Originally from https://github.com/llvm/llvm-project/releases/download/llvmorg-11.0.0/clang+llvm-11.0.0-x86_64-linux-gnu-ubuntu-16.04.tar.xz
6-
curl https://ci-mirrors.rust-lang.org/rustc/2021-01-14-clang%2Bllvm-11.0.1-x86_64-linux-gnu-ubuntu-16.04.tar.xz | \
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 | \
77
tar xJf -
8-
export PATH=`pwd`/clang+llvm-11.0.1-x86_64-linux-gnu-ubuntu-16.04/bin:$PATH
8+
bin="$PWD/clang+llvm-14.0.0-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 ad5133410f66b93a2381db5b542aad5e0964db96
14-
make -j$(nproc) INSTALL_DIR=/wasm32-wasi install
13+
git reset --hard 9886d3d6200fcc3726329966860fc058707406cd
14+
make -j$(nproc) \
15+
CC="$bin/clang" \
16+
NM="$bin/llvm-nm" \
17+
AR="$bin/llvm-ar" \
18+
INSTALL_DIR=/wasm32-wasi \
19+
install
1520

1621
cd ..
1722
rm -rf wasi-libc

0 commit comments

Comments
 (0)