diff options
| author | Manish Goregaokar <manishsmail@gmail.com> | 2020-08-01 09:30:16 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-01 09:30:16 -0700 |
| commit | 58df0a0473d7a02959a2a7043a2d46688909b5fe (patch) | |
| tree | fc9f1f1130f98e8b32e994e0433eef9f2b0433a9 /src/ci/docker | |
| parent | 69515819b625292f0c175a92d93339b2f231b947 (diff) | |
| parent | 9ade8366c076f1b40d846b5ed76c141d48beb70d (diff) | |
| download | rust-58df0a0473d7a02959a2a7043a2d46688909b5fe.tar.gz rust-58df0a0473d7a02959a2a7043a2d46688909b5fe.zip | |
Rollup merge of #74995 - sunfishcode:update-llvm, r=alexcrichton
Update the WASI libc build to LLVM 10. Among other things, this brings in [the `__main_argc_argv`] patch, which simplifies the interaction between the compiler and WASI libc's startup code, which will help work on reactor support. [the `__main_argc_argv` patch]: https://github.com/llvm/llvm-project/commit/00072c08c75050ae2c835b7bb0e505475dbcd7b9 r? @alexcrichton
Diffstat (limited to 'src/ci/docker')
| -rwxr-xr-x | src/ci/docker/host-x86_64/dist-various-2/build-wasi-toolchain.sh | 6 |
1 files changed, 3 insertions, 3 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 e9e4a893476..c6db200f866 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 @@ -4,10 +4,10 @@ set -ex -# Originally from https://releases.llvm.org/9.0.0/clang+llvm-9.0.0-x86_64-linux-gnu-ubuntu-14.04.tar.xz -curl https://ci-mirrors.rust-lang.org/rustc/clang%2Bllvm-9.0.0-x86_64-linux-gnu-ubuntu-14.04.tar.xz | \ +# Originally from https://github.com/llvm/llvm-project/releases/download/llvmorg-10.0.0/clang+llvm-10.0.0-x86_64-linux-gnu-ubuntu-18.04.tar.xz +curl https://ci-mirrors.rust-lang.org/rustc/clang%2Bllvm-10.0.0-x86_64-linux-gnu-ubuntu-18.04.tar.xz | \ tar xJf - -export PATH=`pwd`/clang+llvm-9.0.0-x86_64-linux-gnu-ubuntu-14.04/bin:$PATH +export PATH=`pwd`/clang+llvm-10.0.0-x86_64-linux-gnu-ubuntu-18.04/bin:$PATH git clone https://github.com/WebAssembly/wasi-libc |