configure.ac | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
New commits:
commit d626eeb9f6038829064e73d194dde517d2a7eed9
Author: Tor Lillqvist <t...@collabora.com>
AuthorDate: Mon Mar 14 23:43:35 2022 +0200
Commit: Tor Lillqvist <t...@collabora.com>
CommitDate: Mon Mar 28 15:05:56 2022 +0200
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>
Signed-off-by: Xisco Fauli <xiscofa...@libreoffice.org>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131975
Tested-by: Jenkins
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132197
diff --git a/configure.ac b/configure.ac
index dfb99a1abbc4..53aa28c939ee 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3136,7 +3136,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-12.1 12.0 11.3 11.1 11.0 10.15 10.14
10.13}; do
+ for _macosx_sdk in ${with_macosx_sdk-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
with_macosx_sdk="${_macosx_sdk}"
@@ -3180,8 +3180,11 @@ if test $_os = Darwin; then
12.1)
MACOSX_SDK_VERSION=120100
;;
+ 12.3)
+ MACOSX_SDK_VERSION=120300
+ ;;
*)
- AC_MSG_ERROR([with-macosx-sdk $with_macosx_sdk is not a supported
value, supported values are 10.13--12.1])
+ AC_MSG_ERROR([with-macosx-sdk $with_macosx_sdk is not a supported
value, supported values are 10.13--12.3])
;;
esac
@@ -3255,8 +3258,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.10--12.1])
+ AC_MSG_ERROR([with-macosx-version-min-required
$with_macosx_version_min_required is not a supported value, supported values
are 10.10--12.3])
;;
esac
