From 1aea60d91db6dc55cf7108b3f8ddf3c7049af0ff Mon Sep 17 00:00:00 2001 From: Roman Yurchak Date: Wed, 10 Feb 2021 09:23:10 +0100 Subject: [PATCH] MAINT Update to emscripten 2.0.13 (#1198) Co-authored-by: Dexter Chua --- Makefile.envs | 4 ++-- emsdk/Makefile | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Makefile.envs b/Makefile.envs index 0a2a1a9e0..983c7cc5a 100644 --- a/Makefile.envs +++ b/Makefile.envs @@ -1,5 +1,5 @@ -export EMSCRIPTEN_VERSION = 2.0.12 -export BINARYEN_VERSION = version_99 +export EMSCRIPTEN_VERSION = 2.0.13 +export BINARYEN_VERSION = ed20954 # version_99. The git tag tags the wrong commit # BASH_ENV tells bash to run pyodide_env.sh on startup, whcih sets various # environment variables. The next line instructs make to use bash to run each diff --git a/emsdk/Makefile b/emsdk/Makefile index 2e9f8e9f5..80a1c5af5 100644 --- a/emsdk/Makefile +++ b/emsdk/Makefile @@ -7,7 +7,8 @@ emsdk/.complete: ../Makefile.envs $(wildcard patches/*.patch) if [ -d emsdk ]; then rm -rf emsdk; fi git clone --depth 1 https://github.com/emscripten-core/emsdk.git cd emsdk && ./emsdk install --build=Release $(EMSCRIPTEN_VERSION) - git clone -b $(BINARYEN_VERSION) --depth 1 https://github.com/WebAssembly/binaryen.git emsdk/binaryen + git clone https://github.com/WebAssembly/binaryen.git emsdk/binaryen + cd emsdk/binaryen && git checkout $(BINARYEN_VERSION) cat patches/*.patch | patch -p1 cd emsdk && ./emsdk activate --embedded --build=Release $(EMSCRIPTEN_VERSION) cmake -S emsdk/binaryen -B emsdk/binaryen -DBUILD_STATIC_LIB=ON -DCMAKE_CXX_COMPILER_LAUNCHER=ccache