diff --git a/Makefile b/Makefile index 27e2b9698..b5489fd57 100644 --- a/Makefile +++ b/Makefile @@ -190,7 +190,7 @@ ccache/emcc: if hash ccache &>/dev/null; then \ ln -s `which ccache` $(PYODIDE_ROOT)/ccache/emcc ; \ else \ - ln -s emsdk/emsdk/emscripten/tag-1.38.10/emcc $(PYODIDE_ROOT)/ccache/emcc; \ + ln -s emsdk/emsdk/emscripten/tag-1.38.12/emcc $(PYODIDE_ROOT)/ccache/emcc; \ fi @@ -199,7 +199,7 @@ ccache/em++: if hash ccache &>/dev/null; then \ ln -s `which ccache` $(PYODIDE_ROOT)/ccache/em++ ; \ else \ - ln -s emsdk/emsdk/emscripten/tag-1.38.10/em++ $(PYODIDE_ROOT)/ccache/em++; \ + ln -s emsdk/emsdk/emscripten/tag-1.38.12/em++ $(PYODIDE_ROOT)/ccache/em++; \ fi diff --git a/Makefile.envs b/Makefile.envs index dcc1704f7..7f714d9b8 100644 --- a/Makefile.envs +++ b/Makefile.envs @@ -3,8 +3,8 @@ export PATH := $(PYODIDE_ROOT)/ccache:$(PYODIDE_ROOT)/emsdk/emsdk:$(PYODIDE_ROOT export EMSDK = $(PYODIDE_ROOT)/emsdk/emsdk export EM_CONFIG = $(PYODIDE_ROOT)/emsdk/emsdk/.emscripten export EM_CACHE = $(PYODIDE_ROOT)/emsdk/emsdk/.emscripten_cache -export EMSCRIPTEN = $(PYODIDE_ROOT)/emsdk/emsdk/emscripten/tag-1.38.10 -export BINARYEN_ROOT = $(PYODIDE_ROOT)/emsdk/emsdk/binaryen/tag-1.38.10_64bit_binaryen +export EMSCRIPTEN = $(PYODIDE_ROOT)/emsdk/emsdk/emscripten/tag-1.38.12 +export BINARYEN_ROOT = $(PYODIDE_ROOT)/emsdk/emsdk/binaryen/tag-1.38.12_64bit_binaryen export PYVERSION=3.7.0 export PYMINOR=$(basename $(PYVERSION)) diff --git a/emsdk/Makefile b/emsdk/Makefile index fb75fd548..153de8622 100644 --- a/emsdk/Makefile +++ b/emsdk/Makefile @@ -9,13 +9,13 @@ emsdk/.complete: sed -i -e "s#CPU_CORES = max(multiprocessing.cpu_count()-1, 1)#CPU_CORES = 3#g" emsdk/emsdk ( \ cd emsdk ; \ - ./emsdk install --build=Release sdk-tag-1.38.10-64bit binaryen-tag-1.38.10-64bit ; \ + ./emsdk install --build=Release sdk-tag-1.38.12-64bit binaryen-tag-1.38.12-64bit ; \ cd .. ; \ (cat patches/*.patch | patch -p1) ; \ - cd emsdk/binaryen/tag-1.38.10_64bit_binaryen/ ; \ + cd emsdk/binaryen/tag-1.38.12_64bit_binaryen/ ; \ make ; \ cd ../.. ; \ - ./emsdk activate --embedded --build=Release sdk-tag-1.38.10-64bit binaryen-tag-1.38.10-64bit ; \ + ./emsdk activate --embedded --build=Release sdk-tag-1.38.12-64bit binaryen-tag-1.38.12-64bit ; \ touch .complete \ ) diff --git a/emsdk/patches/lz4_c.patch b/emsdk/patches/lz4_c.patch index f8d93eb57..6cd6ef6b3 100644 --- a/emsdk/patches/lz4_c.patch +++ b/emsdk/patches/lz4_c.patch @@ -1,4 +1,4 @@ -diff --git a/emsdk/emscripten/tag-1.38.10/src/library_lz4.js b/emsdk/emscripten/tag-1.38.10/src/library_lz4.js +diff --git a/emsdk/emscripten/tag-1.38.12/src/library_lz4.js b/emsdk/emscripten/tag-1.38.12/src/library_lz4.js index 4c3f583b7..5291002a4 100644 --- a/src/library_lz4.js +++ b/src/library_lz4.js diff --git a/emsdk/patches/num_params.patch b/emsdk/patches/num_params.patch index e46c966d0..c9850fede 100644 --- a/emsdk/patches/num_params.patch +++ b/emsdk/patches/num_params.patch @@ -1,7 +1,7 @@ diff --git a/emsdk/binaryen/master/src/passes/FuncCastEmulation.cpp b/emsdk/binaryen/master/src/passes/FuncCastEmulation.cpp index 013e9403..d95fc282 100644 ---- a/emsdk/binaryen/tag-1.38.10/src/passes/FuncCastEmulation.cpp -+++ b/emsdk/binaryen/tag-1.38.10/src/passes/FuncCastEmulation.cpp +--- a/emsdk/binaryen/tag-1.38.12/src/passes/FuncCastEmulation.cpp ++++ b/emsdk/binaryen/tag-1.38.12/src/passes/FuncCastEmulation.cpp @@ -39,7 +39,7 @@ namespace wasm { // This should be enough for everybody. (As described above, we need this // to match when dynamically linking, and also dynamic linking is why we diff --git a/tools/file_packager.py b/tools/file_packager.py index d0a09186a..db5bdd80c 100644 --- a/tools/file_packager.py +++ b/tools/file_packager.py @@ -69,7 +69,7 @@ sys.path.insert( os.path.abspath(__file__) ) ), - 'emsdk', 'emsdk', 'emscripten', 'tag-1.38.10' + 'emsdk', 'emsdk', 'emscripten', 'tag-1.38.12' ) )