Update code to use new path

pyodide · Dec 30, 2019 · f98aaf6 · f98aaf6
1 parent 46ef552
commit f98aaf6
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/Makefile.envs b/Makefile.envs
@@ -1,6 +1,6 @@
 export EMSCRIPTEN_VERSION = 1.38.30
 
-export PATH := $(PYODIDE_ROOT)/ccache:$(PYODIDE_ROOT)/emsdk/emsdk:$(PYODIDE_ROOT)/emsdk/emsdk/clang/tag-e$(EMSCRIPTEN_VERSION)/build_tag-e$(EMSCRIPTEN_VERSION)_64/bin:$(PYODIDE_ROOT)/emsdk/emsdk/node/8.9.1_64bit/bin:$(PYODIDE_ROOT)/emsdk/emsdk/emscripten/tag-$(EMSCRIPTEN_VERSION):$(PYODIDE_ROOT)/emsdk/emsdk/binaryen/tag-$(EMSCRIPTEN_VERSION)_64bit_binaryen/bin:$(PATH)
+export PATH := $(PYODIDE_ROOT)/ccache:$(PYODIDE_ROOT)/emsdk/emsdk:$(PYODIDE_ROOT)/emsdk/emsdk/fastcomp-clang/tag-e$(EMSCRIPTEN_VERSION)/build_tag-e$(EMSCRIPTEN_VERSION)_64/bin:$(PYODIDE_ROOT)/emsdk/emsdk/node/8.9.1_64bit/bin:$(PYODIDE_ROOT)/emsdk/emsdk/emscripten/tag-$(EMSCRIPTEN_VERSION):$(PYODIDE_ROOT)/emsdk/emsdk/binaryen/tag-$(EMSCRIPTEN_VERSION)_64bit_binaryen/bin:$(PATH)
 
 export EMSDK = $(PYODIDE_ROOT)/emsdk/emsdk
 export EM_CONFIG = $(PYODIDE_ROOT)/emsdk/emsdk/.emscripten

diff --git a/emsdk/Makefile b/emsdk/Makefile
@@ -18,7 +18,7 @@ emsdk/.complete:
 		cd emsdk/binaryen/tag-$(EMSCRIPTEN_VERSION)_64bit_binaryen/ && \
     make && \
 	  cd ../../.. && \
-		cd emsdk/clang/tag-e$(EMSCRIPTEN_VERSION)/build_tag-e$(EMSCRIPTEN_VERSION)_64/ && \
+		cd emsdk/fastcomp-clang/tag-e$(EMSCRIPTEN_VERSION)/build_tag-e$(EMSCRIPTEN_VERSION)_64/ && \
     make && \
     cd ../../.. && \
 		./emsdk activate --embedded --build=Release sdk-fastcomp-tag-$(EMSCRIPTEN_VERSION)-64bit binaryen-tag-$(EMSCRIPTEN_VERSION)-64bit && \

diff --git a/emsdk/clean_for_dist.sh b/emsdk/clean_for_dist.sh
@@ -5,7 +5,7 @@ find . -name "*.a" -type f -delete
 find -type d -name .git -prune -exec rm -rf {} \;
 find -type d -name CMakeFiles -prune -exec rm -rf {} \;
 rm -rf emsdk/emscripten/incoming/tests
-rm -rf emsdk/clang/fastcomp/src
+rm -rf emsdk/emsdk/fastcomp-clang/fastcomp/src
 rm -rf emsdk/zips
 rm -rf emsdk/binaryen/master/test
 rm -rf emsdk/.emscripten_cache

diff --git a/emsdk/patches/callHandlers.patch b/emsdk/patches/callHandlers.patch
@@ -1,8 +1,8 @@
 From https://github.com/emscripten-core/emscripten-fastcomp/pull/25 6
-diff --git a/emsdk/clang/tag-e1.38.30/src/lib/Target/JSBackend/CallHandlers.h b/emsdk/clang/tag-e1.38.30/src/lib/Target/JSBackend/CallHandlers.h
+diff --git a/emsdk/fastcomp-clang/tag-e1.38.30/src/lib/Target/JSBackend/CallHandlers.h b/emsdk/fastcomp-clang/tag-e1.38.30/src/lib/Target/JSBackend/CallHandlers.h
 index e414c0444a7..9c3ae3bf288 100644
---- a/emsdk/clang/tag-e1.38.80/src/lib/Target/JSBackend/CallHandlers.h
-+++ b/emsdk/clang/tag-e1.38.30/src/lib/Target/JSBackend/CallHandlers.h
+--- a/emsdk/fastcomp-clang/tag-e1.38.80/src/lib/Target/JSBackend/CallHandlers.h
++++ b/emsdk/fastcomp-clang/tag-e1.38.30/src/lib/Target/JSBackend/CallHandlers.h
 @@ -843,17 +843,21 @@ DEF_CALL_HANDLER(emscripten_asm_const_async_on_main_thread, {
 
  DEF_CALL_HANDLER(emscripten_atomic_exchange_u8, {