Only build wasm-opt in binaryen (pyodide#1012)

bus3297 · Jan 2, 2021 · 2ffd312 · 2ffd312
1 parent 869044b
commit 2ffd312
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/Makefile.envs b/Makefile.envs
@@ -1,7 +1,7 @@
 export EMSCRIPTEN_VERSION = 1.38.44
 export BINARYEN_VERSION = version_86
 
-export PATH := $(PYODIDE_ROOT)/ccache:$(PYODIDE_ROOT)/emsdk/emsdk:$(PYODIDE_ROOT)/emsdk/emsdk/node/12.18.1_64bit/bin:$(PYODIDE_ROOT)/emsdk/emsdk/binaryen/bin/:$(PYODIDE_ROOT)/emsdk/emsdk/fastcomp/emscripten/:$(PYODIDE_ROOT)/node_modules/.bin/:$(PATH)
+export PATH := $(PYODIDE_ROOT)/ccache:$(PYODIDE_ROOT)/emsdk/emsdk:$(PYODIDE_ROOT)/emsdk/emsdk/node/12.18.1_64bit/bin:$(PYODIDE_ROOT)/emsdk/emsdk/fastcomp/emscripten/:$(PYODIDE_ROOT)/node_modules/.bin/:$(PATH)
 
 export EMSDK = $(PYODIDE_ROOT)/emsdk/emsdk
 export EM_CONFIG = $(PYODIDE_ROOT)/emsdk/emsdk/.emscripten

diff --git a/emsdk/Makefile b/emsdk/Makefile
@@ -11,8 +11,8 @@ emsdk/.complete: ../Makefile.envs $(wildcard patches/*.patch)
 	cat patches/*.patch | patch -p1
 	cd emsdk && ./emsdk activate --embedded --build=Release $(EMSCRIPTEN_VERSION)-fastcomp
 	cmake -S emsdk/binaryen -B emsdk/binaryen
-	make -C emsdk/binaryen -j5
-	sed -i "s/BINARYEN_ROOT.*/BINARYEN_ROOT = emsdk_path \+ '\/binaryen'/g" emsdk/.emscripten
+	make -C emsdk/binaryen -j5 wasm-opt
+	cp emsdk/binaryen/bin/wasm-opt emsdk/fastcomp/bin/
 	touch emsdk/.complete
 
 clean:

diff --git a/emsdk/tests/common.py b/emsdk/tests/common.py
@@ -14,7 +14,7 @@
     "EMSDK": str(EMSDK),
     "EM_CONFIG": str(EMSDK / ".emscripten"),
     "EM_CACHE": str(EMSDK / ".emscripten_cache"),
-    "BINARYEN_ROOT": str(EMSDK / "binaryen"),
+    "BINARYEN_ROOT": str(EMSDK / "fastcomp"),
 }
 
 MAIN_C = """