Merge branch 'xcode11-build-mono' of github.com:mandel-macaque/xamarin-macios into xcode11-build-mono
This commit is contained in:
Коммит
8da6ff09cc
|
@ -124,6 +124,8 @@ SDK_ARGS= \
|
|||
IOS_VERSION=$(IOS_SDK_VERSION) IOS_VERSION_MIN=$(MIN_IOS_SDK_VERSION) \
|
||||
TVOS_VERSION=$(TVOS_SDK_VERSION) TVOS_VERSION_MIN=$(MIN_TVOS_SDK_VERSION) \
|
||||
WATCHOS_VERSION=$(WATCH_SDK_VERSION) WATCHOS_VERSION_MIN=$(MIN_WATCHOS_SDK_VERSION) \
|
||||
WATCHOS5_VERSION=$(WATCH_SDK_VERSION) WATCHOS5_VERSION_MIN=$(MIN_WATCHOS_SDK_VERSION) \
|
||||
MACOS_VERSION=$(OSX_SDK_VERSION) MACOS_VERSION_MIN=$(MIN_OSX_SDK_VERSION)
|
||||
IGNORE_PROVISION_LLVM=1
|
||||
|
||||
ifdef DISABLE_DOWNLOAD_LLVM
|
||||
|
|
|
@ -1 +1 @@
|
|||
Subproject commit 9f2e85cc82d5f8645b8e678fac12b557e8943cb8
|
||||
Subproject commit 0b67549de5d98a2abb520b71a5e9ded9be61580d
|
|
@ -113,6 +113,9 @@ if test -z "$ENABLE_DEVICE_BUILD"; then
|
|||
CONFIGURE_FLAGS="$CONFIGURE_FLAGS --disable-ios-device"
|
||||
fi
|
||||
|
||||
# Build from source for Xcode 11 support until mono has packages
|
||||
CONFIGURE_FLAGS="$CONFIGURE_FLAGS --disable-packaged-mono"
|
||||
|
||||
make reset
|
||||
make git-clean-all
|
||||
make print-versions
|
||||
|
|
|
@ -78,7 +78,7 @@ while ! test -z $1; do
|
|||
unset IGNORE_HOMEBREW
|
||||
PROVISION_SHARPIE=1
|
||||
unset IGNORE_SHARPIE
|
||||
PROVISION_SIMULATORS=1
|
||||
#PROVISION_SIMULATORS=1
|
||||
unset IGNORE_SIMULATORS
|
||||
shift
|
||||
;;
|
||||
|
|
Загрузка…
Ссылка в новой задаче