Skip to content

Commit 4cc0cc7

Browse files
committed
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.
1 parent e8af822 commit 4cc0cc7

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

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

+7-2
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,18 @@ set -ex
55
# 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
66
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-14.0.0-x86_64-linux-gnu-ubuntu-18.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
1313
git reset --hard 9886d3d6200fcc3726329966860fc058707406cd
14-
make -j$(nproc) INSTALL_DIR=/wasm32-wasi install
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)