Commit 58048cff authored by Michael Droettboom's avatar Michael Droettboom

Upgrade to emscripten 1.38.12

parent 27d135e6
...@@ -190,7 +190,7 @@ ccache/emcc: ...@@ -190,7 +190,7 @@ ccache/emcc:
if hash ccache &>/dev/null; then \ if hash ccache &>/dev/null; then \
ln -s `which ccache` $(PYODIDE_ROOT)/ccache/emcc ; \ ln -s `which ccache` $(PYODIDE_ROOT)/ccache/emcc ; \
else \ 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 fi
...@@ -199,7 +199,7 @@ ccache/em++: ...@@ -199,7 +199,7 @@ ccache/em++:
if hash ccache &>/dev/null; then \ if hash ccache &>/dev/null; then \
ln -s `which ccache` $(PYODIDE_ROOT)/ccache/em++ ; \ ln -s `which ccache` $(PYODIDE_ROOT)/ccache/em++ ; \
else \ 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 fi
......
...@@ -3,8 +3,8 @@ export PATH := $(PYODIDE_ROOT)/ccache:$(PYODIDE_ROOT)/emsdk/emsdk:$(PYODIDE_ROOT ...@@ -3,8 +3,8 @@ export PATH := $(PYODIDE_ROOT)/ccache:$(PYODIDE_ROOT)/emsdk/emsdk:$(PYODIDE_ROOT
export EMSDK = $(PYODIDE_ROOT)/emsdk/emsdk export EMSDK = $(PYODIDE_ROOT)/emsdk/emsdk
export EM_CONFIG = $(PYODIDE_ROOT)/emsdk/emsdk/.emscripten export EM_CONFIG = $(PYODIDE_ROOT)/emsdk/emsdk/.emscripten
export EM_CACHE = $(PYODIDE_ROOT)/emsdk/emsdk/.emscripten_cache export EM_CACHE = $(PYODIDE_ROOT)/emsdk/emsdk/.emscripten_cache
export EMSCRIPTEN = $(PYODIDE_ROOT)/emsdk/emsdk/emscripten/tag-1.38.10 export EMSCRIPTEN = $(PYODIDE_ROOT)/emsdk/emsdk/emscripten/tag-1.38.12
export BINARYEN_ROOT = $(PYODIDE_ROOT)/emsdk/emsdk/binaryen/tag-1.38.10_64bit_binaryen export BINARYEN_ROOT = $(PYODIDE_ROOT)/emsdk/emsdk/binaryen/tag-1.38.12_64bit_binaryen
export PYVERSION=3.7.0 export PYVERSION=3.7.0
export PYMINOR=$(basename $(PYVERSION)) export PYMINOR=$(basename $(PYVERSION))
......
...@@ -9,13 +9,13 @@ emsdk/.complete: ...@@ -9,13 +9,13 @@ emsdk/.complete:
sed -i -e "s#CPU_CORES = max(multiprocessing.cpu_count()-1, 1)#CPU_CORES = 3#g" emsdk/emsdk sed -i -e "s#CPU_CORES = max(multiprocessing.cpu_count()-1, 1)#CPU_CORES = 3#g" emsdk/emsdk
( \ ( \
cd 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 .. ; \ cd .. ; \
(cat patches/*.patch | patch -p1) ; \ (cat patches/*.patch | patch -p1) ; \
cd emsdk/binaryen/tag-1.38.10_64bit_binaryen/ ; \ cd emsdk/binaryen/tag-1.38.12_64bit_binaryen/ ; \
make ; \ make ; \
cd ../.. ; \ 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 \ touch .complete \
) )
......
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 index 4c3f583b7..5291002a4 100644
--- a/src/library_lz4.js --- a/src/library_lz4.js
+++ b/src/library_lz4.js +++ b/src/library_lz4.js
......
diff --git a/emsdk/binaryen/master/src/passes/FuncCastEmulation.cpp b/emsdk/binaryen/master/src/passes/FuncCastEmulation.cpp diff --git a/emsdk/binaryen/master/src/passes/FuncCastEmulation.cpp b/emsdk/binaryen/master/src/passes/FuncCastEmulation.cpp
index 013e9403..d95fc282 100644 index 013e9403..d95fc282 100644
--- a/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.10/src/passes/FuncCastEmulation.cpp +++ b/emsdk/binaryen/tag-1.38.12/src/passes/FuncCastEmulation.cpp
@@ -39,7 +39,7 @@ namespace wasm { @@ -39,7 +39,7 @@ namespace wasm {
// This should be enough for everybody. (As described above, we need this // This should be enough for everybody. (As described above, we need this
// to match when dynamically linking, and also dynamic linking is why we // to match when dynamically linking, and also dynamic linking is why we
......
...@@ -69,7 +69,7 @@ sys.path.insert( ...@@ -69,7 +69,7 @@ sys.path.insert(
os.path.abspath(__file__) os.path.abspath(__file__)
) )
), ),
'emsdk', 'emsdk', 'emscripten', 'tag-1.38.10' 'emsdk', 'emsdk', 'emscripten', 'tag-1.38.12'
) )
) )
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment