diff options
| author | Zoltan Varga <vargaz@gmail.com> | 2019-11-08 22:43:32 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-08 22:43:32 +0300 |
| commit | 73b50890cc1fd2cb8ea4b7c209c03bfbd491359b (patch) | |
| tree | ed165d2caa56934afd1dd4d35a5bbfb0326f5327 /sdks | |
| parent | 5b0a822afb97375ba90e0a6bcab53b4b4755b2c1 (diff) | |
[wasm] Bump emscripten. (#17748)
* [wasm] Bump emscipten to 1.39.2.
* Disable some code in libtest.c which causes emscripten to fail.
* [wasm] Source emscripten env before make install as well.
Diffstat (limited to 'sdks')
| -rw-r--r-- | sdks/builds/wasm.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sdks/builds/wasm.mk b/sdks/builds/wasm.mk index 766e753ce17..a913e697da7 100644 --- a/sdks/builds/wasm.mk +++ b/sdks/builds/wasm.mk @@ -1,7 +1,7 @@ #emcc has lots of bash'isms SHELL:=/bin/bash -EMSCRIPTEN_VERSION=1.39.0 +EMSCRIPTEN_VERSION=1.39.2 EMSCRIPTEN_LOCAL_SDK_DIR=$(TOP)/sdks/builds/toolchains/emsdk EMSCRIPTEN_SDK_DIR ?= $(EMSCRIPTEN_LOCAL_SDK_DIR) @@ -116,7 +116,7 @@ setup-custom-wasm-$(1): # zlib support for wasm through emscripten. See flag "-s USE_ZLIB=1" in wasm build .PHONY: package-wasm-$(1) package-wasm-$(1): - $(MAKE) -C $(TOP)/sdks/builds/wasm-$(1)-$(CONFIGURATION)/mono install + source $(EMSCRIPTEN_SDK_DIR)/emsdk_env.sh && $(MAKE) -C $(TOP)/sdks/builds/wasm-$(1)-$(CONFIGURATION)/mono install mkdir -p $(TOP)/sdks/out/wasm-$(1)-$(CONFIGURATION)/include/support cp -r $(ZLIB_HEADERS) $(TOP)/sdks/out/wasm-$(1)-$(CONFIGURATION)/include/support/ |