diff options
| author | Dan Gohman <dev@sunfishcode.online> | 2022-05-16 05:07:28 -0700 |
|---|---|---|
| committer | Dan Gohman <dev@sunfishcode.online> | 2022-05-16 05:07:28 -0700 |
| commit | 4cc0cc7eb3f35bc15967922a94245917e0a7c0e2 (patch) | |
| tree | b71a8fbce3c991b0f9a8ba95b9571cfad5401928 | |
| parent | e8af822423498e1393d71b9fa64f64b6182c5b44 (diff) | |
| download | rust-4cc0cc7eb3f35bc15967922a94245917e0a7c0e2.tar.gz rust-4cc0cc7eb3f35bc15967922a94245917e0a7c0e2.zip | |
Update how CC etc. are set in the wasi-libc Makefile.
wasi-libc's Makefile changed how it detects the compiler to use; update Rust's script to set `CC` directly to the compiler it installs.
| -rwxr-xr-x | src/ci/docker/host-x86_64/dist-various-2/build-wasi-toolchain.sh | 9 |
1 files changed, 7 insertions, 2 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 cbfc66d7ea8..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 @@ -5,13 +5,18 @@ set -ex # 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-14.0.0-x86_64-linux-gnu-ubuntu-18.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 9886d3d6200fcc3726329966860fc058707406cd -make -j$(nproc) INSTALL_DIR=/wasm32-wasi install +make -j$(nproc) \ + CC="$bin/clang" \ + NM="$bin/llvm-nm" \ + AR="$bin/llvm-ar" \ + INSTALL_DIR=/wasm32-wasi \ + install cd .. rm -rf wasi-libc |