Skip to content

Commit

Permalink
Rollup merge of #75716 - tlively:upgrade-emscripten-1.39.20, r=cuviper
Browse files Browse the repository at this point in the history
Upgrade Emscripten on CI to 1.39.20

This Emscripten version was the first to be cut after the LLVM 11
release branch was created, so it should be the most compatible with
LLVM 11. The old version we were using was incompatible with LLVM 11
because its wasm-ld did not understand all the relocations that LLVM
11 emits.
  • Loading branch information
cuviper authored Aug 20, 2020
2 parents 6a3425e + f3585a9 commit 02b2f73
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/ci/docker/scripts/emscripten.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,5 @@ exit 1

git clone https://github.com/emscripten-core/emsdk.git /emsdk-portable
cd /emsdk-portable
hide_output ./emsdk install 1.38.47-upstream
./emsdk activate 1.38.47-upstream
hide_output ./emsdk install 1.39.20
./emsdk activate 1.39.20

0 comments on commit 02b2f73

Please sign in to comment.