diff options
| author | Tor Lillqvist <tml@collabora.com> | 2021-10-27 13:28:58 +0300 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2021-10-29 11:21:40 +0200 |
| commit | 10a92904b036c7d2bfcd8f5dc91e3f9a4e113dbe (patch) | |
| tree | 7b6826edfb5f9348986287e2751d0bdc07326308 | |
| parent | 40a5e54212f7131515d1a4a81cd48635a3441e7b (diff) | |
Accept macOS SDK 12.0
Change-Id: I3e2b004578394e0199ac425f7b80da47a668f70d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124266
Tested-by: Tor Lillqvist <tml@collabora.com>
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124276
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
| -rw-r--r-- | configure.ac | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index e8d580767953..151e6dc08954 100644 --- a/configure.ac +++ b/configure.ac @@ -3126,7 +3126,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}" @@ -3164,8 +3164,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 @@ -3233,8 +3236,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 @@ -3301,8 +3307,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 |