nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-01 06:51:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update how CC etc. are set in the wasi-libc Makefile.

Browse Source 
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.
This commit is contained in:
Dan Gohman 2022-05-16 05:07:28 -07:00
parent e8af822423
commit 4cc0cc7eb3
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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 # 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 | \ 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 - 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 git clone https://github.com/WebAssembly/wasi-libc
cd wasi-libc cd wasi-libc
git reset --hard 9886d3d6200fcc3726329966860fc058707406cd 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 .. cd ..
rm -rf wasi-libc rm -rf wasi-libc