diff options
| author | bors <bors@rust-lang.org> | 2019-10-04 20:33:02 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-10-04 20:33:02 +0000 |
| commit | 7870050796e5904a0fc85ecbe6fa6dde1cfe0c91 (patch) | |
| tree | 9a1cd1fe1091eb7e2ddaf1df8f9ea93eb70c6fa2 /src/ci/docker/scripts/emscripten.sh | |
| parent | 2e7244807a7878f6eca3eb7d97ae9b413aa49014 (diff) | |
| parent | 4a4df29d6fa12c303e3991f0e0e3677342c4787c (diff) | |
| download | rust-7870050796e5904a0fc85ecbe6fa6dde1cfe0c91.tar.gz rust-7870050796e5904a0fc85ecbe6fa6dde1cfe0c91.zip | |
Auto merge of #63649 - tlively:emscripten-upstream-upgrade, r=alexcrichton
Upgrade Emscripten targets to use upstream LLVM backend - Refactors the Emscripten target spec to share code with other wasm targets. - Replaces the incorrect wasm32 C call ABI with the old asmjs version, which is correct for both wasm32 and JS. - Updates the varargs ABI used by Emscripten and deletes the old one. - Removes the obsolete wasm32-experimental-emscripten target. - Temporarily makes Emscripten targets use panic=abort by default because supporting unwinding will require an LLVM patch.
Diffstat (limited to 'src/ci/docker/scripts/emscripten.sh')
| -rw-r--r-- | src/ci/docker/scripts/emscripten.sh | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/src/ci/docker/scripts/emscripten.sh b/src/ci/docker/scripts/emscripten.sh index 47196e89396..9c7a09e227a 100644 --- a/src/ci/docker/scripts/emscripten.sh +++ b/src/ci/docker/scripts/emscripten.sh @@ -17,20 +17,15 @@ exit 1 set -x } -cd / -curl -fL https://mozilla-games.s3.amazonaws.com/emscripten/releases/emsdk-portable.tar.gz | \ - tar -xz - +git clone https://github.com/emscripten-core/emsdk.git /emsdk-portable cd /emsdk-portable -./emsdk update -hide_output ./emsdk install sdk-1.38.15-64bit -./emsdk activate sdk-1.38.15-64bit +hide_output ./emsdk install 1.38.46-upstream +./emsdk activate 1.38.46-upstream # Compile and cache libc source ./emsdk_env.sh echo "main(){}" > a.c HOME=/emsdk-portable/ emcc a.c -HOME=/emsdk-portable/ emcc -s BINARYEN=1 a.c rm -f a.* # Make emsdk usable by any user |
