Rooba
/
pyodide
mirror of https://github.com/pyodide/pyodide.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MAINT Update to emscripten 2.0.13 (#1198) 

Co-authored-by: Dexter Chua <dalcde@users.noreply.github.com>
This commit is contained in:
Roman Yurchak 2021-02-10 09:23:10 +01:00 committed by GitHub
parent a4907839dd
commit 1aea60d91d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.envs
View File

@ -1,5 +1,5 @@
export EMSCRIPTEN_VERSION = 2.0.12 export EMSCRIPTEN_VERSION = 2.0.13
export BINARYEN_VERSION = version_99 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 # 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 # environment variables. The next line instructs make to use bash to run each

3
emsdk/Makefile
View File

@ -7,7 +7,8 @@ emsdk/.complete: ../Makefile.envs $(wildcard patches/*.patch)
if [ -d emsdk ]; then rm -rf emsdk; fi if [ -d emsdk ]; then rm -rf emsdk; fi
git clone --depth 1 https://github.com/emscripten-core/emsdk.git git clone --depth 1 https://github.com/emscripten-core/emsdk.git
cd emsdk && ./emsdk install --build=Release $(EMSCRIPTEN_VERSION) 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 cat patches/*.patch | patch -p1
cd emsdk && ./emsdk activate --embedded --build=Release $(EMSCRIPTEN_VERSION) 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 cmake -S emsdk/binaryen -B emsdk/binaryen -DBUILD_STATIC_LIB=ON -DCMAKE_CXX_COMPILER_LAUNCHER=ccache