Skip to content
Snippets Groups Projects
Unverified Commit 01fb19e1 authored by Yuki Okushi's avatar Yuki Okushi Committed by GitHub
Browse files

Merge pull request #1868 from JohnTitor/emsdk-1.39.20

Update emsdk to 1.39.20
parents ace7ba86 94da1152
No related branches found
No related tags found
No related merge requests found
...@@ -6,6 +6,7 @@ set -ex ...@@ -6,6 +6,7 @@ set -ex
source /emsdk-portable/emsdk_env.sh &> /dev/null source /emsdk-portable/emsdk_env.sh &> /dev/null
# emsdk-portable provides a node binary, but we need version 8 to run wasm # emsdk-portable provides a node binary, but we need version 8 to run wasm
export PATH="/node-v12.16.2-linux-x64/bin:$PATH" # NOTE: Do not forget to sync Node.js version with `emscripten.sh`!
export PATH="/node-v12.18.3-linux-x64/bin:$PATH"
exec "$@" exec "$@"
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
set -ex set -ex
EMSDK_VERSION=1.39.19 EMSDK_VERSION=1.39.20
hide_output() { hide_output() {
set +x set +x
...@@ -23,8 +23,6 @@ exit 1 ...@@ -23,8 +23,6 @@ exit 1
git clone https://github.com/emscripten-core/emsdk.git /emsdk-portable git clone https://github.com/emscripten-core/emsdk.git /emsdk-portable
cd /emsdk-portable cd /emsdk-portable
# FIXME: switch to an upstream install once
# https://github.com/rust-lang/rust/pull/63649 lands
hide_output ./emsdk install "${EMSDK_VERSION}" hide_output ./emsdk install "${EMSDK_VERSION}"
./emsdk activate "${EMSDK_VERSION}" ./emsdk activate "${EMSDK_VERSION}"
...@@ -39,6 +37,7 @@ rm -f a.* ...@@ -39,6 +37,7 @@ rm -f a.*
chmod a+rxw -R /emsdk-portable chmod a+rxw -R /emsdk-portable
# node 8 is required to run wasm # node 8 is required to run wasm
# NOTE: Do not forget to sync Node.js version with `emscripten-entry.sh`!
cd / cd /
curl --retry 5 -L https://nodejs.org/dist/v12.16.2/node-v12.16.2-linux-x64.tar.xz | \ curl --retry 5 -L https://nodejs.org/dist/v12.18.3/node-v12.18.3-linux-x64.tar.xz | \
tar -xJ tar -xJ
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment