diff options
| author | Zoltan Varga <vargaz@gmail.com> | 2018-10-11 23:33:37 +0300 |
|---|---|---|
| committer | Alexander Köplinger <alex.koeplinger@outlook.com> | 2018-10-11 23:33:37 +0300 |
| commit | 92ebd1793bcd71681f9e07ade5e3a9afa0872cda (patch) | |
| tree | f131d72073555b582e6e97fc23447797a5891b04 /sdks/builds | |
| parent | 2c3ad9d4580b2e967075a4468be865a015e6ffae (diff) | |
[wasm] Fix the build. (#11063)
Diffstat (limited to 'sdks/builds')
| -rw-r--r-- | sdks/builds/Makefile | 4 | ||||
| -rw-r--r-- | sdks/builds/wasm.mk | 16 |
2 files changed, 9 insertions, 11 deletions
diff --git a/sdks/builds/Makefile b/sdks/builds/Makefile index 9bc479ac68c..b8760eb1131 100644 --- a/sdks/builds/Makefile +++ b/sdks/builds/Makefile @@ -17,10 +17,6 @@ ifneq ($(UNAME),Darwin) DISABLE_IOS=1 endif -ifndef ENABLE_WASM_CROSS -DISABLE_WASM_CROSS=1 -endif - include $(TOP)/sdks/versions.mk include $(TOP)/sdks/paths.mk diff --git a/sdks/builds/wasm.mk b/sdks/builds/wasm.mk index f6eeaea77f8..5c55bf9d469 100644 --- a/sdks/builds/wasm.mk +++ b/sdks/builds/wasm.mk @@ -35,7 +35,7 @@ WASM_RUNTIME_CONFIGURE_FLAGS = \ --enable-icall-export \ --disable-icall-tables \ --with-bitcode=yes \ - $(if $(ENABLE_CXX),--enable-cxx) + $(if $(ENABLE_CXX),--enable-cxx) \ CFLAGS="-fexceptions" .stamp-wasm-runtime-toolchain: @@ -88,17 +88,19 @@ _wasm-$(1)_CONFIGURE_FLAGS= \ --disable-nls \ --disable-support-build \ --enable-maintainer-mode \ - --enable-minimal=appdomains,com,remoting + --enable-minimal=appdomains,com,remoting \ + --enable-icall-symbol-map \ + --with-cross-offsets=wasm32-unknown-none.h $$(eval $$(call CrossRuntimeTemplate,wasm-$(1),$$(if $$(filter $$(UNAME),Darwin),$(2)-apple-darwin10,$$(if $$(filter $$(UNAME),Linux),$(2)-linux-gnu,$$(error "Unknown UNAME='$$(UNAME)'"))),$(3)-unknown-none,$(4),$(5),$(6))) +ifdef ENABLE_WASM_CROSS wasm_TARGETS += wasm-$(1)-$$(CONFIGURATION) $(5) +endif endef -ifeq ($(DISABLE_WASM_CROSS),) $(eval $(call WasmCrossTemplate,cross,i686,wasm32,wasm-runtime,llvm-llvm32,wasm32-unknown-unknown)) -endif ## # Parameters @@ -150,19 +152,19 @@ _wasm-$(1)_CONFIGURE_FLAGS= \ --enable-minimal=appdomains,com,remoting \ --with-tls=pthread \ --enable-icall-symbol-map \ - --with-cross-offsets=wasm-offsets.h + --with-cross-offsets=wasm32-unknown-none.h .stamp-wasm-$(1)-$$(CONFIGURATION)-configure: | $$(if $$(IGNORE_PROVISION_MXE),,provision-mxe) $$(eval $$(call CrossRuntimeTemplate,wasm-$(1),$(2)-w64-mingw32$$(if $$(filter $(UNAME),Darwin),.static),$(3)-unknown-none,$(4),$(5),$(6))) +ifdef ENABLE_WASM_CROSS wasm_TARGETS += wasm-$(1)-$$(CONFIGURATION) $(5) +endif endef -ifeq ($(DISABLE_WASM_CROSS),) $(eval $(call WasmCrossMXETemplate,cross-win,i686,wasm32,wasm-runtime,llvm-llvmwin32,wasm32-unknown-unknown)) -endif ## # Parameters |