configure.ac | 17 +++++++++++++----
1 file changed, 13 insertions(+), 4 deletions(-)
New commits:
commit dc32231639615aa2ded614a9e120e7adc8e03e6f
Author: Tor Lillqvist <t...@collabora.com>
AuthorDate: Wed Oct 27 13:28:58 2021 +0300
Commit: Michael Stahl <michael.st...@allotropia.de>
CommitDate: Thu Oct 28 11:05:01 2021 +0200
Accept macOS SDK 12.0
Change-Id: I3e2b004578394e0199ac425f7b80da47a668f70d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124266
Tested-by: Tor Lillqvist <t...@collabora.com>
Reviewed-by: Tor Lillqvist <t...@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124276
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.st...@allotropia.de>
diff --git a/configure.ac b/configure.ac
index a9c4b1513bd7..bd28bc6eb38e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3131,7 +3131,7 @@ if test $_os = Darwin; then
# higher than or equal to the minimum required should be found.
AC_MSG_CHECKING([what macOS SDK to use])
- for _macosx_sdk in ${with_macosx_sdk-11.3 11.1 11.0 10.15 10.14 10.13}; do
+ for _macosx_sdk in ${with_macosx_sdk-12.0 11.3 11.1 11.0 10.15 10.14
10.13}; do
MACOSX_SDK_PATH=`xcrun --sdk macosx${_macosx_sdk} --show-sdk-path 2>
/dev/null`
if test -d "$MACOSX_SDK_PATH"; then
with_macosx_sdk="${_macosx_sdk}"
@@ -3169,8 +3169,11 @@ if test $_os = Darwin; then
11.3)
MACOSX_SDK_VERSION=110300
;;
+ 12.0)
+ MACOSX_SDK_VERSION=120000
+ ;;
*)
- AC_MSG_ERROR([with-macosx-sdk $with_macosx_sdk is not a supported
value, supported values are 10.13--11.3])
+ AC_MSG_ERROR([with-macosx-sdk $with_macosx_sdk is not a supported
value, supported values are 10.13--12.0])
;;
esac
@@ -3238,8 +3241,11 @@ if test $_os = Darwin; then
11.3)
MAC_OS_X_VERSION_MIN_REQUIRED="110300"
;;
+ 12.0)
+ MAC_OS_X_VERSION_MIN_REQUIRED="120000"
+ ;;
*)
- AC_MSG_ERROR([with-macosx-version-min-required
$with_macosx_version_min_required is not a supported value, supported values
are 10.10--11.3])
+ AC_MSG_ERROR([with-macosx-version-min-required
$with_macosx_version_min_required is not a supported value, supported values
are 10.10--12.0])
;;
esac
@@ -3306,8 +3312,11 @@ if test $_os = Darwin; then
11.3)
MAC_OS_X_VERSION_MAX_ALLOWED="110300"
;;
+ 12.0)
+ MAC_OS_X_VERSION_MAX_ALLOWED="120000"
+ ;;
*)
- AC_MSG_ERROR([with-macosx-version-max-allowed
$with_macosx_version_max_allowed is not a supported value, supported values are
10.10--11.3])
+ AC_MSG_ERROR([with-macosx-version-max-allowed
$with_macosx_version_max_allowed is not a supported value, supported values are
10.10--12.0])
;;
esac
