configure.ac | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
New commits:
commit 38054361895eb0d06a23a704d8b8402139f1bd63
Author: Tor Lillqvist <t...@collabora.com>
AuthorDate: Mon Mar 14 23:43:35 2022 +0200
Commit: Tor Lillqvist <t...@collabora.com>
CommitDate: Mon Mar 21 11:55:44 2022 +0100
Accept macOS SDK 12.3
Change-Id: Ice469236dd79675b6fad6f7c5a244888200fea8b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131565
Tested-by: Tor Lillqvist <t...@collabora.com>
Reviewed-by: Tor Lillqvist <t...@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131894
diff --git a/configure.ac b/configure.ac
index e55f8c8564c4..79af091ae68b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3280,7 +3280,7 @@ if test $_os = Darwin; then
# The SDK in the currently selected Xcode should be found.
AC_MSG_CHECKING([what macOS SDK to use])
- for macosx_sdk in 12.1 12.0 11.3 11.1 11.0 10.15 10.14 10.13; do
+ for macosx_sdk in 12.3 12.1 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
break
@@ -3322,6 +3322,9 @@ if test $_os = Darwin; then
12.1)
MACOSX_SDK_VERSION=120100
;;
+ 12.3)
+ MACOSX_SDK_VERSION=120300
+ ;;
*)
AC_MSG_ERROR([macOS SDK $macosx_sdk is not supported])
;;
@@ -3391,8 +3394,11 @@ if test $_os = Darwin; then
12.1)
MAC_OS_X_VERSION_MIN_REQUIRED="120100"
;;
+ 12.3)
+ MAC_OS_X_VERSION_MIN_REQUIRED="120300"
+ ;;
*)
- AC_MSG_ERROR([with-macosx-version-min-required
$with_macosx_version_min_required is not a supported value, supported values
are 10.12--12.1])
+ AC_MSG_ERROR([with-macosx-version-min-required
$with_macosx_version_min_required is not a supported value, supported values
are 10.12--12.3])
;;
esac
@@ -3459,8 +3465,11 @@ if test $_os = Darwin; then
12.1)
MAC_OS_X_VERSION_MAX_ALLOWED="120100"
;;
+ 12.3)
+ MAC_OS_X_VERSION_MAX_ALLOWED="120300"
+ ;;
*)
- AC_MSG_ERROR([with-macosx-version-max-allowed
$with_macosx_version_max_allowed is not a supported value, supported values are
10.12--12.1])
+ AC_MSG_ERROR([with-macosx-version-max-allowed
$with_macosx_version_max_allowed is not a supported value, supported values are
10.12--12.3])
;;
esac
