diff options
| author | bors <bors@rust-lang.org> | 2018-11-10 01:16:02 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-11-10 01:16:02 +0000 |
| commit | 06118eac4c602a22d2004c98756a95f2c5ec95d5 (patch) | |
| tree | 4039e739f4710fbe8a4aab96b21bfd1cc46a0daa /src/ci/docker/scripts | |
| parent | 36a50c29f6c5c386fba6ab685818755ac55152e5 (diff) | |
| parent | 82574e9ec804b6efbf6dfcf523d32618528ee32b (diff) | |
| download | rust-06118eac4c602a22d2004c98756a95f2c5ec95d5.tar.gz rust-06118eac4c602a22d2004c98756a95f2c5ec95d5.zip | |
Auto merge of #55626 - nikic:update-emscripten, r=alexcrichton
Update emscripten This updates emscripten to 1.38.15, which is based on LLVM 6.0.1 and would allow us to drop code for handling LLVM 4. The main issue I ran into is that exporting statics through `EXPORTED_FUNCTIONS` no longer works. As far as I understand exporting non-functions doesn't really make sense under emscripten anyway, so I've modified the symbol export code to not even try. Closes #52323.
Diffstat (limited to 'src/ci/docker/scripts')
| -rw-r--r-- | src/ci/docker/scripts/emscripten.sh | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/ci/docker/scripts/emscripten.sh b/src/ci/docker/scripts/emscripten.sh index d32ed6b461d..1d7b33db9ed 100644 --- a/src/ci/docker/scripts/emscripten.sh +++ b/src/ci/docker/scripts/emscripten.sh @@ -33,8 +33,8 @@ curl -fL https://s3.amazonaws.com/mozilla-games/emscripten/releases/emsdk-portab cd /emsdk-portable ./emsdk update -hide_output ./emsdk install sdk-1.37.13-64bit -./emsdk activate sdk-1.37.13-64bit +hide_output ./emsdk install sdk-1.38.15-64bit +./emsdk activate sdk-1.38.15-64bit # Compile and cache libc source ./emsdk_env.sh @@ -46,8 +46,3 @@ rm -f a.* # Make emsdk usable by any user cp /root/.emscripten /emsdk-portable chmod a+rxw -R /emsdk-portable - -# node 8 is required to run wasm -cd / -curl -sL https://nodejs.org/dist/v8.0.0/node-v8.0.0-linux-x64.tar.xz | \ - tar -xJ |