Skip to content

Commit 0a75921

Browse files
committed
build: specify path to Wasm-to-JavaScript compiler
1 parent 0634fc1 commit 0a75921

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

tools/make/lib/install/emsdk.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ deps-update-emsdk: deps-install-emsdk deps-test-emsdk
185185
# @example
186186
# make deps-test-emsdk
187187
#/
188-
deps-test-emsdk: $(DEPS_EMSDK_TEST_INSTALL_WASM_OUT)
188+
deps-test-emsdk: $(DEPS_EMSDK_TEST_INSTALL_WASM_OUT) deps-test-emsdk-wasm
189189
$(QUIET) echo '' >&2
190190
$(QUIET) echo 'emcc info...' >&2
191191
$(QUIET) echo '' >&2
@@ -206,7 +206,7 @@ deps-test-emsdk: $(DEPS_EMSDK_TEST_INSTALL_WASM_OUT)
206206
deps-test-emsdk-wasm: $(DEPS_EMSDK_TEST_INSTALL_WASM_OUT)
207207
$(QUIET) echo 'Running wasm tests...' >&2
208208
$(QUIET) echo '' >&2
209-
$(QUIET) echo 'TODO: make more robust' >&2
209+
$(QUIET) echo 'TODO: make test more robust' >&2
210210
$(QUIET) test -f $(DEPS_EMSDK_TEST_INSTALL_WASM_OUT) >&2
211211
$(QUIET) echo '' >&2
212212
$(QUIET) echo 'Success.' >&2

tools/make/lib/wasm/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ wasm: $(NODE_MODULES)
6161
SRC_FOLDER="$(SRC_FOLDER)" \
6262
EMCC_COMPILER="$(DEPS_EMSDK_EMSCRIPTEN_EMCC)" \
6363
WASM2WAT="$(DEPS_WABT_WASM2WAT)" \
64+
WASM2JS="$(DEPS_EMSDK_EMSCRIPTEN_WASM2JS)" \
6465
"${compile_wasm_bin}" $$pkg \
6566
|| { echo "Error: failed to compile WebAssembly: $$pkg"; exit 0; } \
6667
done

0 commit comments

Comments
 (0)