diff options
| author | Tor Lillqvist <tml@collabora.com> | 2021-10-27 13:28:58 +0300 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2021-10-31 17:34:58 +0100 |
| commit | e98083f2845238ed04c14f9a8e6da8e5db56727b (patch) | |
| tree | 6f53c2dd9c18355362cd8cd64bc5ed18b30d408c /configure.ac | |
| parent | 6a94729cba8d452f5390672b69843607f7287dba (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/+/124272
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index 5be3f8c2b272..3c4e92dca78a 100644 --- a/configure.ac +++ b/configure.ac @@ -3225,7 +3225,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}" @@ -3263,8 +3263,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 @@ -3332,8 +3335,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 @@ -3400,8 +3406,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 |