[xcode10.1] [builds] Adjust ifdefs to fix not building device architectures. Fixes maccore#1074. (#4909)
* [builds] Adjust ifdefs to fix not building device architectures. Fixes maccore#1074. Fixes https://github.com/xamarin/maccore/issues/1074. * [jenkins] Running configure and then cleaning everything is kind of useless, so reverse the order.
This commit is contained in:
Родитель
9f23f4b45a
Коммит
31ed3422ff
|
@ -1177,17 +1177,15 @@ $(eval $(call DeviceBuildTemplate,arm64,target64,target64,$(ARM64_ARCH_CONFIGURE
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifdef INCLUDE_DEVICE
|
ifdef INCLUDE_DEVICE
|
||||||
|
ifdef INCLUDE_IOS
|
||||||
iphoneos:: setup-iphoneos build-iphoneos install-iphoneos
|
iphoneos:: setup-iphoneos build-iphoneos install-iphoneos
|
||||||
device:: iphoneos
|
device:: iphoneos
|
||||||
clean-device: clean-iphoneos
|
clean-device: clean-iphoneos
|
||||||
install-device: install-iphoneos
|
install-device: install-iphoneos
|
||||||
|
|
||||||
# this needs to be here because the normal usage of this makefile is "make all install", but nothing actually lists the -iphoneos targets as dependencies.
|
# this needs to be here because the normal usage of this makefile is "make all install", but nothing actually lists the -iphoneos targets as dependencies.
|
||||||
ifdef INCLUDE_IOS
|
|
||||||
install-local:: install-iphoneos
|
install-local:: install-iphoneos
|
||||||
all-local:: install-iphoneos
|
all-local:: install-iphoneos
|
||||||
endif
|
|
||||||
endif
|
|
||||||
|
|
||||||
LIBMONO_PROFILER_IPHONEOS_DYLIB=$(IOS_DESTDIR)$(IPHONEOS_PREFIX)/lib/libmono-profiler-log.dylib
|
LIBMONO_PROFILER_IPHONEOS_DYLIB=$(IOS_DESTDIR)$(IPHONEOS_PREFIX)/lib/libmono-profiler-log.dylib
|
||||||
|
|
||||||
|
@ -1242,6 +1240,9 @@ $(IOS_DESTDIR)$(IPHONEOS_SDK)/Frameworks/Mono.framework/Info.plist: Mono.framewo
|
||||||
|
|
||||||
install-iphoneos:: $(IPHONEOS_TARGETS)
|
install-iphoneos:: $(IPHONEOS_TARGETS)
|
||||||
|
|
||||||
|
endif # INCLUDE_IOS
|
||||||
|
endif # INCLUDE_DEVICE
|
||||||
|
|
||||||
#
|
#
|
||||||
# Watch device build
|
# Watch device build
|
||||||
#
|
#
|
||||||
|
@ -1260,8 +1261,6 @@ targetwatch: build-targetwatch install-watchos
|
||||||
watchos:: targetwatch
|
watchos:: targetwatch
|
||||||
|
|
||||||
.PHONY: targetwatch
|
.PHONY: targetwatch
|
||||||
endif
|
|
||||||
endif
|
|
||||||
|
|
||||||
.stamp-build-targetwatch: $(MONO_PATH)/configure $(SDK_CONFIG) $(MONO_DEPENDENCIES)
|
.stamp-build-targetwatch: $(MONO_PATH)/configure $(SDK_CONFIG) $(MONO_DEPENDENCIES)
|
||||||
$(MAKE) -C $(SDK_BUILDDIR) package-ios-targetwatch $(SDK_ARGS)
|
$(MAKE) -C $(SDK_BUILDDIR) package-ios-targetwatch $(SDK_ARGS)
|
||||||
|
@ -1354,6 +1353,9 @@ $(BUILD_DESTDIR)/targetwatch/tmp-lib/Mono: $(BUILD_DESTDIR)/targetwatch/lib/libm
|
||||||
|
|
||||||
install-watchos: $(WATCHOS_TARGETS)
|
install-watchos: $(WATCHOS_TARGETS)
|
||||||
|
|
||||||
|
endif # INCLUDE_DEVICE
|
||||||
|
endif # INCLUDE_WATCH
|
||||||
|
|
||||||
#
|
#
|
||||||
# TV device build
|
# TV device build
|
||||||
#
|
#
|
||||||
|
@ -1372,8 +1374,6 @@ targettv: build-targettv install-tvos
|
||||||
tvos:: targettv
|
tvos:: targettv
|
||||||
|
|
||||||
.PHONY: targettv
|
.PHONY: targettv
|
||||||
endif
|
|
||||||
endif
|
|
||||||
|
|
||||||
.stamp-build-targettv: $(MONO_PATH)/configure $(SDK_CONFIG) $(MONO_DEPENDENCIES)
|
.stamp-build-targettv: $(MONO_PATH)/configure $(SDK_CONFIG) $(MONO_DEPENDENCIES)
|
||||||
$(MAKE) -C $(SDK_BUILDDIR) package-ios-targettv $(SDK_ARGS)
|
$(MAKE) -C $(SDK_BUILDDIR) package-ios-targettv $(SDK_ARGS)
|
||||||
|
@ -1465,6 +1465,9 @@ $(BUILD_DESTDIR)/targettv/tmp-lib/Mono: $(BUILD_DESTDIR)/targettv/lib/libmonosge
|
||||||
|
|
||||||
install-tvos: $(TVOS_TARGETS)
|
install-tvos: $(TVOS_TARGETS)
|
||||||
|
|
||||||
|
endif # INCLUDE_DEVICE
|
||||||
|
endif # INCLUDE_TVOS
|
||||||
|
|
||||||
#
|
#
|
||||||
# Cross compilers
|
# Cross compilers
|
||||||
#
|
#
|
||||||
|
@ -1553,8 +1556,6 @@ offsets-tool: $(MONO_PATH)/tools/offsets-tool/MonoAotOffsetsDumper.exe
|
||||||
##
|
##
|
||||||
define iOSCrossTemplate
|
define iOSCrossTemplate
|
||||||
|
|
||||||
ifdef INCLUDE_IOS
|
|
||||||
ifdef INCLUDE_DEVICE
|
|
||||||
$(1): build-$(1) install-$(1)
|
$(1): build-$(1) install-$(1)
|
||||||
|
|
||||||
.PHONY: build-$(1) install-$(1)
|
.PHONY: build-$(1) install-$(1)
|
||||||
|
@ -1562,8 +1563,6 @@ $(1): build-$(1) install-$(1)
|
||||||
build:: build-$(1)
|
build:: build-$(1)
|
||||||
install-local:: install-$(1)
|
install-local:: install-$(1)
|
||||||
clean-local:: clean-$(1)
|
clean-local:: clean-$(1)
|
||||||
endif
|
|
||||||
endif
|
|
||||||
|
|
||||||
.stamp-build-$(1): .stamp-build-llvm $(MONO_PATH)/configure $(MONO_PATH)/tools/offsets-tool/MonoAotOffsetsDumper.exe $(MONO_DEPENDENCIES) $(SDK_CONFIG)
|
.stamp-build-$(1): .stamp-build-llvm $(MONO_PATH)/configure $(MONO_PATH)/tools/offsets-tool/MonoAotOffsetsDumper.exe $(MONO_DEPENDENCIES) $(SDK_CONFIG)
|
||||||
$(MAKE) -C $(SDK_BUILDDIR) package-ios-$(1) $(SDK_ARGS) $(if $(5), XCODE_DIR=$(5))
|
$(MAKE) -C $(SDK_BUILDDIR) package-ios-$(1) $(SDK_ARGS) $(if $(5), XCODE_DIR=$(5))
|
||||||
|
@ -1587,6 +1586,10 @@ clean-$(1): $(SDK_CONFIG)
|
||||||
|
|
||||||
endef
|
endef
|
||||||
|
|
||||||
|
ifdef INCLUDE_IOS
|
||||||
|
ifdef INCLUDE_DEVICE
|
||||||
$(eval $(call iOSCrossTemplate,cross32,llvm32,arm-darwin-mono-sgen,arm-darwin-mono-sgen,$(XCODE94_DEVELOPER_ROOT)))
|
$(eval $(call iOSCrossTemplate,cross32,llvm32,arm-darwin-mono-sgen,arm-darwin-mono-sgen,$(XCODE94_DEVELOPER_ROOT)))
|
||||||
$(eval $(call iOSCrossTemplate,cross64,llvm64,arm64-darwin-mono-sgen,aarch64-darwin-mono-sgen))
|
$(eval $(call iOSCrossTemplate,cross64,llvm64,arm64-darwin-mono-sgen,aarch64-darwin-mono-sgen))
|
||||||
$(eval $(call iOSCrossTemplate,crosswatch,llvm32,armv7k-unknown-darwin-mono-sgen,armv7k-unknown-darwin-mono-sgen,$(XCODE94_DEVELOPER_ROOT)))
|
$(eval $(call iOSCrossTemplate,crosswatch,llvm32,armv7k-unknown-darwin-mono-sgen,armv7k-unknown-darwin-mono-sgen,$(XCODE94_DEVELOPER_ROOT)))
|
||||||
|
endif
|
||||||
|
endif
|
||||||
|
|
|
@ -59,13 +59,14 @@ fi
|
||||||
if test -z "$ENABLE_DEVICE_BUILD"; then
|
if test -z "$ENABLE_DEVICE_BUILD"; then
|
||||||
CONFIGURE_FLAGS="$CONFIGURE_FLAGS --disable-ios-device"
|
CONFIGURE_FLAGS="$CONFIGURE_FLAGS --disable-ios-device"
|
||||||
fi
|
fi
|
||||||
# shellcheck disable=SC2086
|
|
||||||
./configure $CONFIGURE_FLAGS
|
|
||||||
|
|
||||||
make reset
|
make reset
|
||||||
make git-clean-all
|
make git-clean-all
|
||||||
make print-versions
|
make print-versions
|
||||||
|
|
||||||
|
# shellcheck disable=SC2086
|
||||||
|
./configure $CONFIGURE_FLAGS
|
||||||
|
|
||||||
time make -j8
|
time make -j8
|
||||||
time make install -j8
|
time make install -j8
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче