diff options
| author | Ludovic Henry <luhenry@microsoft.com> | 2018-11-29 20:30:59 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-29 20:30:59 +0300 |
| commit | e8c423ec2b2ca7162219c3cdb2ec362fe3188866 (patch) | |
| tree | 0886fc63ea42db51232fc6cf45cf0b46541dbd3f /sdks/builds/ios.mk | |
| parent | 27d1568d21c85f5c3d4a8c30e836b2b3922f6877 (diff) | |
[sdks] Reduce android provisioning to minimum + Rework targets generation (#11835)
* [sdks] Reduce android provisioning to minimum
It's not in use by XA anymore, so we only care about what we require
* [sdks] Rework targets generation
Diffstat (limited to 'sdks/builds/ios.mk')
| -rw-r--r-- | sdks/builds/ios.mk | 23 |
1 files changed, 8 insertions, 15 deletions
diff --git a/sdks/builds/ios.mk b/sdks/builds/ios.mk index 0bc2c8b30db..dd3c6490773 100644 --- a/sdks/builds/ios.mk +++ b/sdks/builds/ios.mk @@ -104,9 +104,7 @@ _ios-$(1)_CONFIGURE_FLAGS = \ .stamp-ios-$(1)-toolchain: touch $$@ -$$(eval $$(call RuntimeTemplate,ios-$(1),$(2)-apple-darwin10)) - -ios_TARGETS += ios-$(1)-$$(CONFIGURATION) +$$(eval $$(call RuntimeTemplate,ios,$(1),$(2)-apple-darwin10)) endef @@ -229,9 +227,7 @@ _ios-$(1)_CONFIGURE_FLAGS= \ .stamp-ios-$(1)-toolchain: touch $$@ -$$(eval $$(call RuntimeTemplate,ios-$(1),$(2)-apple-darwin10)) - -ios_TARGETS += ios-$(1)-$$(CONFIGURATION) +$$(eval $$(call RuntimeTemplate,ios,$(1),$(2)-apple-darwin10)) endef @@ -328,18 +324,15 @@ _ios-$(1)_CONFIGURE_FLAGS= \ --enable-minimal=com,remoting \ --disable-crash-reporting -$$(eval $$(call CrossRuntimeTemplate,ios-$(1),$(2)-apple-darwin10,$(3)-darwin,$(4),$(5),$(6))) - -ios_TARGETS += ios-$(1)-$$(CONFIGURATION) $(5) +$$(eval $$(call CrossRuntimeTemplate,ios,$(1),$(2)-apple-darwin10,$(3)-darwin,$(4),$(5),$(6))) endef -$(eval $(call iOSCrossTemplate,cross32,i386,arm,ios-target32,llvm36-llvm32,arm-apple-darwin10)) -$(eval $(call iOSCrossTemplate,cross64,x86_64,aarch64,ios-target64,llvm-llvm64,aarch64-apple-darwin10)) +$(eval $(call iOSCrossTemplate,cross32,i386,arm,target32,llvm36-llvm32,arm-apple-darwin10)) +$(eval $(call iOSCrossTemplate,cross64,x86_64,aarch64,target64,llvm-llvm64,aarch64-apple-darwin10)) ios-crosswatch_CONFIGURE_FLAGS=--enable-cooperative-suspend -$(eval $(call iOSCrossTemplate,crosswatch,i386,armv7k-unknown,ios-targetwatch,llvm36-llvm32,armv7k-apple-darwin)) +$(eval $(call iOSCrossTemplate,crosswatch,i386,armv7k-unknown,targetwatch,llvm36-llvm32,armv7k-apple-darwin)) # 64->arm32 cross compiler -$(eval $(call iOSCrossTemplate,cross32-64,x86_64,arm,ios-target32,llvm-llvm64,arm-apple-darwin10)) +$(eval $(call iOSCrossTemplate,cross32-64,x86_64,arm,target32,llvm-llvm64,arm-apple-darwin10)) -$(eval $(call BclTemplate,ios-bcl,monotouch monotouch_runtime monotouch_tv monotouch_tv_runtime monotouch_watch monotouch_watch_runtime monotouch_tools,monotouch monotouch_tv monotouch_watch)) -ios_TARGETS += ios-bcl +$(eval $(call BclTemplate,ios,monotouch monotouch_runtime monotouch_tv monotouch_tv_runtime monotouch_watch monotouch_watch_runtime monotouch_tools,monotouch monotouch_tv monotouch_watch)) |