diff options
| author | Zoltan Varga <vargaz@gmail.com> | 2018-03-15 21:57:16 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-15 21:57:16 +0300 |
| commit | 3141c9490d98f69d69508893bd6a404c5f01173d (patch) | |
| tree | cd609ef3646aa7685a7223bafa6bb8b7472313e0 | |
| parent | e3466bc3254ef548c04ba46b18842bafda380634 (diff) | |
[sdks] IOS fixes. (#7617) (#7628)
* [sdks] Fix ios build.
* [sdks] Pass -DMONOTOUCH to the ios cross compiler builds. Compile monotouch/tvos/watchos profiles for the bcl build.
| -rw-r--r-- | sdks/builds/bcl.mk | 24 | ||||
| -rw-r--r-- | sdks/builds/ios.mk | 6 | ||||
| -rw-r--r-- | sdks/builds/runtime.mk | 6 |
3 files changed, 20 insertions, 16 deletions
diff --git a/sdks/builds/bcl.mk b/sdks/builds/bcl.mk index 9ca732d89ef..b1db4827787 100644 --- a/sdks/builds/bcl.mk +++ b/sdks/builds/bcl.mk @@ -2,20 +2,20 @@ .stamp-bcl-toolchain: touch $@ -bcl_ios_CONFIGURE_FLAGS = \ - --with-monotouch=yes \ - --with-monotouch_tv=yes \ - --with-xammac=yes \ - --with-monotouch_watch=yes +bcl-ios_CONFIGURE_FLAGS = \ + --with-monotouch=yes \ + --with-monotouch_tv=yes \ + --with-xammac=yes \ + --with-monotouch_watch=yes bcl_CONFIGURE_FLAGS = \ - --with-profile4_x=no \ - $(if $(DISABLE_ANDROID),,--with-monodroid=yes) \ - $(if $(DISABLE_IOS),,$(bcl_ios_CONFIGURE_FLAGS)) \ - $(if $(DISABLE_WASM),,--with-wasm=yes) \ - --with-mcs-docs=no \ - --disable-nls \ - --disable-boehm + --with-profile4_x=no \ + $(if $(DISABLE_ANDROID),,--with-monodroid=yes) \ + $(if $(DISABLE_IOS),,$(bcl-ios_CONFIGURE_FLAGS)) \ + $(if $(DISABLE_WASM),,--with-wasm=yes) \ + --with-mcs-docs=no \ + --disable-nls \ + --disable-boehm .stamp-bcl-configure: $(TOP)/configure mkdir -p $(TOP)/sdks/builds/bcl diff --git a/sdks/builds/ios.mk b/sdks/builds/ios.mk index fe707a37609..f05fceb800c 100644 --- a/sdks/builds/ios.mk +++ b/sdks/builds/ios.mk @@ -373,15 +373,15 @@ _ios-$(1)_CONFIGURE_FLAGS= \ .stamp-ios-$(1)-toolchain: touch $$@ -.stamp-ios-$(1)-configure-$$(CONFIGURATION): | build-ios-llvm +.stamp-ios-$(1)-$$(CONFIGURATION)-configure: | build-ios-llvm -$$(TOP)/sdks/builds/ios-$(1)-$$(CONFIGURATION)/$(4).h: .stamp-ios-$(1)-configure-$$(CONFIGURATION) $$(TOP)/tools/offsets-tool/MonoAotOffsetsDumper.exe +$$(TOP)/sdks/builds/ios-$(1)-$$(CONFIGURATION)/$(4).h: .stamp-ios-$(1)-$$(CONFIGURATION)-configure $$(TOP)/tools/offsets-tool/MonoAotOffsetsDumper.exe cd $$(TOP)/sdks/builds/ios-$(1)-$$(CONFIGURATION) && \ MONO_PATH=$(TOP)/tools/offsets-tool/CppSharp/osx_32 \ mono --arch=32 --debug $$(TOP)/tools/offsets-tool/MonoAotOffsetsDumper.exe \ --gen-ios --abi $$(_ios-$(1)_OFFSET_TOOL_ABI) --outfile $$@ --mono $$(TOP) --targetdir $$(TOP)/sdks/builds/ios-$(1)-$$(CONFIGURATION) -build-ios-$(1)-$$(CONFIGURATION): $$(TOP)/sdks/builds/ios-$(1)-$$(CONFIGURATION)/$(4).h +build-custom-ios-$(1):: $$(TOP)/sdks/builds/ios-$(1)-$$(CONFIGURATION)/$(4).h $$(eval $$(call RuntimeTemplate,ios-$(1))) diff --git a/sdks/builds/runtime.mk b/sdks/builds/runtime.mk index 1a3b912e048..61c96a43155 100644 --- a/sdks/builds/runtime.mk +++ b/sdks/builds/runtime.mk @@ -55,7 +55,7 @@ __$(1)_CONFIGURE_ENVIRONMENT = \ .stamp-$(1)-configure: .stamp-$(1)-$$(CONFIGURATION)-configure .PHONY: build-custom-$(1) -build-custom-$(1): +build-custom-$(1):: $$(MAKE) -C $(1)-$$(CONFIGURATION) .PHONY: setup-custom-$(1) @@ -66,6 +66,10 @@ setup-custom-$(1): package-android-$(1)-$$(CONFIGURATION):: $$(MAKE) -C $$(TOP)/sdks/builds/android-$(1)-$$(CONFIGURATION)/mono install +.PHONY: package-$(1)-$$(CONFIGURATION) +package-$(1)-$$(CONFIGURATION):: + $$(MAKE) -C $$(TOP)/sdks/builds/$(1)-$$(CONFIGURATION)/mono install + .PHONY: package-$(1) package-$(1): $$(MAKE) package-$(1)-$$(CONFIGURATION) |