diff options
author | Ludovic Henry <luhenry@microsoft.com> | 2019-02-13 02:57:56 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-02-13 02:57:56 +0300 |
commit | a43f1d2909d100bdcad525dde67eb320478ecbbd (patch) | |
tree | 4951ae04d51b5199fa787051b4825d51e8ebcca0 /sdks/builds/ios.mk | |
parent | 469b0a7a0fa1f63a7333e725e6d11a37a6044854 (diff) |
[sdks] Add mac-{mac32,mac64} targets (#12959)
* [sdks] Add mac-{mac32,mac64} targets
* [sdks] Add configure-* and build-* for CI
Diffstat (limited to 'sdks/builds/ios.mk')
-rw-r--r-- | sdks/builds/ios.mk | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/sdks/builds/ios.mk b/sdks/builds/ios.mk index b10c2899c5a..406bf17b23f 100644 --- a/sdks/builds/ios.mk +++ b/sdks/builds/ios.mk @@ -10,7 +10,7 @@ # Where <target> is: target32, target32s, target64, sim32, sim64, cross32, cross64 # -PLATFORM_BIN=$(XCODE_DIR)/Toolchains/XcodeDefault.xctoolchain/usr/bin +ios_PLATFORM_BIN=$(XCODE_DIR)/Toolchains/XcodeDefault.xctoolchain/usr/bin ## # Device builds @@ -34,8 +34,8 @@ PLATFORM_BIN=$(XCODE_DIR)/Toolchains/XcodeDefault.xctoolchain/usr/bin # define iOSDeviceTemplate -_ios-$(1)_CC=$$(CCACHE) $$(PLATFORM_BIN)/clang -_ios-$(1)_CXX=$$(CCACHE) $$(PLATFORM_BIN)/clang++ +_ios-$(1)_CC=$$(CCACHE) $$(ios_PLATFORM_BIN)/clang +_ios-$(1)_CXX=$$(CCACHE) $$(ios_PLATFORM_BIN)/clang++ _ios-$(1)_AC_VARS= \ ac_cv_c_bigendian=no \ @@ -186,8 +186,8 @@ $(eval $(call iOSDeviceTemplate,targetwatch64_32,aarch64-apple-darwin10_ilp32,ar # define iOSSimulatorTemplate -_ios-$(1)_CC=$$(CCACHE) $$(PLATFORM_BIN)/clang -_ios-$(1)_CXX=$$(CCACHE) $$(PLATFORM_BIN)/clang++ +_ios-$(1)_CC=$$(CCACHE) $$(ios_PLATFORM_BIN)/clang +_ios-$(1)_CXX=$$(CCACHE) $$(ios_PLATFORM_BIN)/clang++ _ios-$(1)_AC_VARS= \ ac_cv_func_clock_nanosleep=no \ @@ -233,8 +233,6 @@ _ios-$(1)_CONFIGURE_FLAGS= \ --disable-hybrid-suspend \ --disable-crash-reporting -# _ios-$(1)_CONFIGURE_FLAGS += --enable-extension-module=xamarin - .stamp-ios-$(1)-toolchain: touch $$@ |