build: specify path to Wasm-to-JavaScript compiler

kgryte · kgryte · commit 0a7592142253 · 2024-09-10T13:28:09.000-07:00
diff --git a/tools/make/lib/install/emsdk.mk b/tools/make/lib/install/emsdk.mk
@@ -185,7 +185,7 @@ deps-update-emsdk: deps-install-emsdk deps-test-emsdk
 # @example
 # make deps-test-emsdk
 #/
-deps-test-emsdk: $(DEPS_EMSDK_TEST_INSTALL_WASM_OUT)
+deps-test-emsdk: $(DEPS_EMSDK_TEST_INSTALL_WASM_OUT) deps-test-emsdk-wasm
 	$(QUIET) echo '' >&2
 	$(QUIET) echo 'emcc info...' >&2
 	$(QUIET) echo '' >&2
@@ -206,7 +206,7 @@ deps-test-emsdk: $(DEPS_EMSDK_TEST_INSTALL_WASM_OUT)
 deps-test-emsdk-wasm: $(DEPS_EMSDK_TEST_INSTALL_WASM_OUT)
 	$(QUIET) echo 'Running wasm tests...' >&2
 	$(QUIET) echo '' >&2
-	$(QUIET) echo 'TODO: make more robust' >&2
+	$(QUIET) echo 'TODO: make test more robust' >&2
 	$(QUIET) test -f $(DEPS_EMSDK_TEST_INSTALL_WASM_OUT) >&2
 	$(QUIET) echo '' >&2
 	$(QUIET) echo 'Success.' >&2
diff --git a/tools/make/lib/wasm/Makefile b/tools/make/lib/wasm/Makefile
@@ -61,6 +61,7 @@ wasm: $(NODE_MODULES)
 		SRC_FOLDER="$(SRC_FOLDER)" \
 		EMCC_COMPILER="$(DEPS_EMSDK_EMSCRIPTEN_EMCC)" \
 		WASM2WAT="$(DEPS_WABT_WASM2WAT)" \
+		WASM2JS="$(DEPS_EMSDK_EMSCRIPTEN_WASM2JS)" \
 		"${compile_wasm_bin}" $$pkg \
 		|| { echo "Error: failed to compile WebAssembly: $$pkg"; exit 0; } \
 	done
