diff options
| author | bors <bors@rust-lang.org> | 2022-05-17 04:37:47 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-05-17 04:37:47 +0000 |
| commit | 1e8cd63d60d55361ae0a62ce87280171d40b6d32 (patch) | |
| tree | 85e9069506cab7af0e6ee0f861422f23e92af970 /src/ci/docker | |
| parent | c1d65eaa456d3986e38868e68e6ce25d802f06b4 (diff) | |
| parent | 4cc0cc7eb3f35bc15967922a94245917e0a7c0e2 (diff) | |
| download | rust-1e8cd63d60d55361ae0a62ce87280171d40b6d32.tar.gz rust-1e8cd63d60d55361ae0a62ce87280171d40b6d32.zip | |
Auto merge of #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
Diffstat (limited to 'src/ci/docker')
| -rwxr-xr-x | src/ci/docker/host-x86_64/dist-various-2/build-wasi-toolchain.sh | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/src/ci/docker/host-x86_64/dist-various-2/build-wasi-toolchain.sh b/src/ci/docker/host-x86_64/dist-various-2/build-wasi-toolchain.sh index 9bd56394eaf..36c94458da7 100755 --- a/src/ci/docker/host-x86_64/dist-various-2/build-wasi-toolchain.sh +++ b/src/ci/docker/host-x86_64/dist-various-2/build-wasi-toolchain.sh @@ -2,16 +2,21 @@ set -ex -# 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 -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 | \ +# 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 +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 | \ tar xJf - -export PATH=`pwd`/clang+llvm-11.0.1-x86_64-linux-gnu-ubuntu-16.04/bin:$PATH +bin="$PWD/clang+llvm-14.0.0-x86_64-linux-gnu-ubuntu-18.04/bin" git clone https://github.com/WebAssembly/wasi-libc cd wasi-libc -git reset --hard ad5133410f66b93a2381db5b542aad5e0964db96 -make -j$(nproc) INSTALL_DIR=/wasm32-wasi install +git reset --hard 9886d3d6200fcc3726329966860fc058707406cd +make -j$(nproc) \ + CC="$bin/clang" \ + NM="$bin/llvm-nm" \ + AR="$bin/llvm-ar" \ + INSTALL_DIR=/wasm32-wasi \ + install cd .. rm -rf wasi-libc |