diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2018-09-18 08:39:21 +0200 |
---|---|---|
committer | Andras Timar <andras.timar@collabora.com> | 2018-10-21 00:13:08 +0200 |
commit | c6af7bc0bd426ec459197c0b52db0a113fb5cd80 (patch) | |
tree | 85045def08e5d157721ce70cb7e7c50a9900e363 | |
parent | 3a31948ae3f2fff1a010efe34d1fcd94e4a1829f (diff) |
macOS SDK 10.14 is outcp-6.0-13
Reviewed-on: https://gerrit.libreoffice.org/60657
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
(cherry picked from commit a8eb515599526b5b69647a842b2889b6f56de2c8)
Change-Id: Iab7bc66db94fe02bb3714234d68b3e2fc3569fdf
-rw-r--r-- | configure.ac | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index c71ea1672658..932d8c73a6f6 100644 --- a/configure.ac +++ b/configure.ac @@ -2618,7 +2618,7 @@ if test $_os = Darwin -o $_os = iOS; then # higher than or equal to the minimum required should be found. AC_MSG_CHECKING([what Mac OS X SDK to use]) - for _macosx_sdk in $with_macosx_sdk 10.13 10.12; do + for _macosx_sdk in ${with_macosx_sdk-10.14 10.13 10.12}; 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}" @@ -2662,6 +2662,9 @@ if test $_os = Darwin -o $_os = iOS; then 10.13) MACOSX_SDK_VERSION=101300 ;; + 10.14) + MACOSX_SDK_VERSION=101400 + ;; *) AC_MSG_ERROR([with-macosx-sdk $with_macosx_sdk is not a supported value, supported values are 10.9--13]) ;; @@ -2698,6 +2701,9 @@ if test $_os = Darwin -o $_os = iOS; then 10.13) MAC_OS_X_VERSION_MIN_REQUIRED="101300" ;; + 10.14) + MAC_OS_X_VERSION_MIN_REQUIRED="101400" + ;; *) AC_MSG_ERROR([with-macosx-version-min-required $with_macosx_version_min_required is not a supported value, supported values are 10.9--13]) ;; @@ -2739,6 +2745,9 @@ if test $_os = Darwin -o $_os = iOS; then 10.13) MAC_OS_X_VERSION_MAX_ALLOWED="101300" ;; + 10.14) + MAC_OS_X_VERSION_MAX_ALLOWED="101400" + ;; *) AC_MSG_ERROR([with-macosx-version-max-allowed $with_macosx_version_max_allowed is not a supported value, supported values are 10.9--13]) ;; |