diff options
| author | Zoltan Varga <vargaz@gmail.com> | 2019-09-08 00:30:48 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-08 00:30:48 +0300 |
| commit | d9aaed760f04236eae858683142de902308cf174 (patch) | |
| tree | bd6719f2c8da38dfa7d0aa1b4caa96417362adee /sdks/builds | |
| parent | 5ba104cf39cf3ed0a6b507af7aeaf324e2a06239 (diff) | |
[sdks] Change the DISABLE_ conditionals to ENABLE_ to avoid building extra stuff. (#16719)
Diffstat (limited to 'sdks/builds')
| -rw-r--r-- | sdks/builds/Makefile | 40 | ||||
| -rw-r--r-- | sdks/builds/wasm.mk | 2 |
2 files changed, 22 insertions, 20 deletions
diff --git a/sdks/builds/Makefile b/sdks/builds/Makefile index ddd8c96a298..ad7aa7cc7b8 100644 --- a/sdks/builds/Makefile +++ b/sdks/builds/Makefile @@ -37,17 +37,17 @@ endif ifneq ($(UNAME),Darwin) # iOS and Mac requires Xcode to be available, and Xcode is only available on macOS -DISABLE_IOS=1 -DISABLE_MAC=1 +ENABLE_IOS= +ENABLE_MAC= endif # On Windows, we will just trigger LLVM and Android builds using this Makefile. ifeq ($(UNAME),Windows) -DISABLE_IOS=1 -DISABLE_MAC=1 -DISABLE_WASM=1 -DISABLE_WASM_CROSS=1 -DISABLE_DESKTOP=1 +ENABLE_IOS= +ENABLE_MAC= +ENABLE_WASM= +ENABLE_WASM_CROSS= +ENABLE_DESKTOP= DISABLE_CCACHE=1 DISABLE_LIBTOOLIZE=1 IGNORE_PROVISION_MXE=1 @@ -93,19 +93,19 @@ $(TOP)/configure: $(TOP)/configure.ac $(TOP)/autogen.sh .stamp-ulimit-check ## Archive targets -ifndef DISABLE_ANDROID +ifdef ENABLE_ANDROID android_ARCHIVE= endif -ifndef DISABLE_IOS +ifdef ENABLE_IOS ios_ARCHIVE= endif -ifndef DISABLE_MAC +ifdef ENABLE_MAC mac_ARCHIVE= endif -ifndef DISABLE_WASM +ifdef ENABLE_WASM wasm_ARCHIVE= endif @@ -126,19 +126,19 @@ archive-$(1): cd $$(TOP)/sdks/out && 7z a $$(_$(1)_COMPRESSION_ARGS) $$(TOP)/$$(_$(1)_PACKAGE) $$(sort $$($(1)_ARCHIVE)) endef -ifndef DISABLE_ANDROID +ifdef ENABLE_ANDROID $(eval $(call ArchiveTemplate,android,7z)) endif -ifndef DISABLE_IOS +ifdef ENABLE_IOS $(eval $(call ArchiveTemplate,ios,7z)) endif -ifndef DISABLE_MAC +ifdef ENABLE_MAC $(eval $(call ArchiveTemplate,mac,7z)) endif -ifndef DISABLE_WASM +ifdef ENABLE_WASM $(eval $(call ArchiveTemplate,wasm,zip)) endif @@ -209,27 +209,27 @@ endif include llvm.mk ## Android targets -ifndef DISABLE_ANDROID +ifdef ENABLE_ANDROID include android.mk endif ## iOS targets -ifndef DISABLE_IOS +ifdef ENABLE_IOS include ios.mk endif ## Mac targets -ifndef DISABLE_MAC +ifdef ENABLE_MAC include mac.mk endif ## Desktop targets ## To run host-side tests -ifndef DISABLE_DESKTOP +ifdef ENABLE_DESKTOP include desktop.mk endif ## WASM targets -ifndef DISABLE_WASM +ifdef ENABLE_WASM include wasm.mk endif diff --git a/sdks/builds/wasm.mk b/sdks/builds/wasm.mk index ab7ef306a0b..518638b6437 100644 --- a/sdks/builds/wasm.mk +++ b/sdks/builds/wasm.mk @@ -241,6 +241,8 @@ $$(eval $$(call CrossRuntimeTemplate,wasm,$(1),$(2)-w64-mingw32$$(if $$(filter $ endef +ifdef ENABLE_WINDOWS $(eval $(call WasmCrossMXETemplate,cross-win,x86_64,wasm32,runtime,llvm-llvmwin64,wasm32-unknown-unknown)) +endif $(eval $(call BclTemplate,wasm,wasm wasm_tools,wasm)) |