diff options
author | Ludovic Henry <luhenry@microsoft.com> | 2018-10-02 00:43:46 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-10-02 00:43:46 +0300 |
commit | 0aebe90cac85a171735629a779f44ca04bc90377 (patch) | |
tree | 14cb84a7d88a4d58762624fce3122a64d800fdc5 /sdks/builds/ios.mk | |
parent | 9182bcccc3ded3ea3b00e10771ea81b0ed3fcc8f (diff) |
[sdks] Create archive targets for pre-building on CI (#10882)
* [sdks] Remove redundant --enable-cxx
* [sdks] Shorten `-m32`/`-m64` parameters detection for runtimes
* [sdks] Build BCL profiles without configure flags
* [sdks] Add BclTemplate to build BCL profiles
This is to avoid building all the profiles in a single `sdks/out/bcl` directory which will be shared between android, ios and wasm.
* [sdks] Create archive targets for pre-building on CI
* [sdks] Use archive-{android,ios,wasm} on CI
* [sdks] Run archive-llvm-llvm{,win}{32,64} on CI
Diffstat (limited to 'sdks/builds/ios.mk')
-rw-r--r-- | sdks/builds/ios.mk | 49 |
1 files changed, 26 insertions, 23 deletions
diff --git a/sdks/builds/ios.mk b/sdks/builds/ios.mk index e6308cb55ab..c5e1060d2af 100644 --- a/sdks/builds/ios.mk +++ b/sdks/builds/ios.mk @@ -12,16 +12,6 @@ PLATFORM_BIN=$(XCODE_DIR)/Toolchains/XcodeDefault.xctoolchain/usr/bin -ios_CPPFLAGS=-DMONOTOUCH=1 - -ios_LDFLAGS= - -COMMON_LDFLAGS=-Wl,-no_weak_imports - -BITCODE_CFLAGS=-fexceptions -BITCODE_LDFLAGS=-framework CoreFoundation -lobjc -lc++ -BITCODE_CONFIGURE_FLAGS=--enable-llvm-runtime --with-bitcode=yes - ## # Device builds # @@ -75,7 +65,7 @@ _ios-$(1)_CXXFLAGS= \ $$(ios-$(1)_BITCODE_MARKER) _ios-$(1)_CPPFLAGS= \ - $$(ios_CPPFLAGS) \ + -DMONOTOUCH=1 \ $$(ios-$(1)_SYSROOT) \ -arch $(3) \ -DSMALL_CONFIG -DDISABLE_POLICY_EVIDENCE=1 -D_XOPEN_SOURCE -DHOST_IOS -DHAVE_LARGE_FILE_SUPPORT=1 \ @@ -87,7 +77,6 @@ _ios-$(1)_LDFLAGS= \ -lobjc -lc++ _ios-$(1)_CONFIGURE_FLAGS = \ - $(if $(ENABLE_CXX),--enable-cxx) \ --disable-boehm \ --disable-btls \ --disable-executables \ @@ -116,6 +105,8 @@ _ios-$(1)_CONFIGURE_FLAGS = \ $$(eval $$(call RuntimeTemplate,ios-$(1),$(2)-apple-darwin10)) +ios_TARGETS += ios-$(1)-$$(CONFIGURATION) + endef ios_sysroot = -isysroot $(XCODE_DIR)/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS$(IOS_VERSION).sdk -miphoneos-version-min=$(IOS_VERSION_MIN) @@ -123,8 +114,8 @@ tvos_sysroot = -isysroot $(XCODE_DIR)/Platforms/AppleTVOS.platform/Developer/SDK watchos_sysroot = -isysroot $(XCODE_DIR)/Platforms/WatchOS.platform/Developer/SDKs/WatchOS$(WATCH_VERSION).sdk -mwatchos-version-min=$(WATCHOS_VERSION_MIN) # explicitly disable dtrace, since it requires inline assembly, which is disabled on AppleTV (and mono's configure.ac doesn't know that (yet at least)) -ios-targettv_CONFIGURE_FLAGS = --enable-dtrace=no $(BITCODE_CONFIGURE_FLAGS) --with-monotouch-tv -ios-targetwatch_CONFIGURE_FLAGS = --enable-cooperative-suspend $(BITCODE_CONFIGURE_FLAGS) --with-monotouch-watch +ios-targettv_CONFIGURE_FLAGS = --enable-dtrace=no --enable-llvm-runtime --with-bitcode=yes --with-monotouch-tv +ios-targetwatch_CONFIGURE_FLAGS = --enable-cooperative-suspend --enable-llvm-runtime --with-bitcode=yes --with-monotouch-watch ios-target32_SYSROOT = $(ios_sysroot) ios-target32s_SYSROOT = $(ios_sysroot) @@ -143,8 +134,8 @@ ios-targettv_CXXFLAGS = -fembed-bitcode -fno-gnu-inline-asm ios-targetwatch_CFLAGS = -fembed-bitcode -fno-gnu-inline-asm ios-targetwatch_CXXFLAGS = -fembed-bitcode -fno-gnu-inline-asm -ios-targettv_LDFLAGS = -Wl,-bitcode_bundle $(BITCODE_LDFLAGS) -ios-targetwatch_LDFLAGS = -Wl,-bitcode_bundle $(BITCODE_LDFLAGS) +ios-targettv_LDFLAGS = -Wl,-bitcode_bundle -framework CoreFoundation -lobjc -lc++ +ios-targetwatch_LDFLAGS = -Wl,-bitcode_bundle -framework CoreFoundation -lobjc -lc++ ios-targettv_AC_VARS = \ ac_cv_func_system=no \ @@ -205,7 +196,7 @@ _ios-$(1)_CFLAGS= \ -Wl,-application_extension _ios-$(1)_CPPFLAGS= \ - $$(ios_CPPFLAGS) \ + -DMONOTOUCH=1 \ $$(ios-$(1)_SYSROOT) \ -arch $(2) \ -Wl,-application_extension @@ -215,11 +206,7 @@ _ios-$(1)_CXXFLAGS= \ -arch $(2) \ -Wl,-application_extension -_ios-$(1)_LDFLAGS= \ - $$(ios_LDFLAGS) - _ios-$(1)_CONFIGURE_FLAGS= \ - $(if $(ENABLE_CXX),--enable-cxx) \ --disable-boehm \ --disable-btls \ --disable-executables \ @@ -243,6 +230,8 @@ _ios-$(1)_CONFIGURE_FLAGS= \ $$(eval $$(call RuntimeTemplate,ios-$(1),$(2)-apple-darwin10)) +ios_TARGETS += ios-$(1)-$$(CONFIGURATION) + endef ios_sim_sysroot = -isysroot $(XCODE_DIR)/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator$(IOS_VERSION).sdk -mios-simulator-version-min=$(IOS_VERSION_MIN) @@ -324,11 +313,9 @@ _ios-$(1)_CPPFLAGS= \ -DMONOTOUCH=1 _ios-$(1)_LDFLAGS= \ - $$(ios_LDFLAGS) \ -stdlib=libc++ _ios-$(1)_CONFIGURE_FLAGS= \ - $(if $(ENABLE_CXX),--enable-cxx) \ --disable-boehm \ --disable-btls \ --disable-iconv \ @@ -342,6 +329,8 @@ _ios-$(1)_CONFIGURE_FLAGS= \ $$(eval $$(call CrossRuntimeTemplate,ios-$(1),$(2)-apple-darwin10,$(3)-darwin,$(4),$(5),$(6))) +ios_TARGETS += ios-$(1)-$$(CONFIGURATION) $(5) + endef $(eval $(call iOSCrossTemplate,cross32,i386,arm,ios-target32,llvm36-llvm32,arm-apple-darwin10)) @@ -350,3 +339,17 @@ ios-crosswatch_CONFIGURE_FLAGS=--enable-cooperative-suspend $(eval $(call iOSCrossTemplate,crosswatch,i386,armv7k-unknown,ios-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)) + +## +# Parameters +# $(1): build profiles +# $(2): test profile +define iOSBclTemplate + +$$(eval $$(call BclTemplate,ios,$(1),$(2))) + +ios_TARGETS += ios-bcl + +endef + +$(eval $(call iOSBclTemplate,monotouch monotouch_tv monotouch_watch monotouch_runtime monotouch_tv_runtime monotouch_watch_runtime,monotouch)) |