summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2018-09-18 08:39:21 +0200
committerAndras Timar <andras.timar@collabora.com>2018-10-21 06:47:40 +0200
commit35196c456ae1ffb9d826c8ec3b8967d6656779f0 (patch)
treedcd2fee4d432e526798c7d6cd84427f8ed4a573d
parent6201ab17a66ce552e0a0d647a4c04ad64d3dd56b (diff)
macOS SDK 10.14 is outco-5.3-58
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.ac12
1 files changed, 10 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac
index 7b11377cad1a..6c9f89128e2a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2744,8 +2744,7 @@ if test $_os = Darwin; 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.8 10.9 10.10 10.11 10.12 10.13; do
+ for _macosx_sdk in $with_macosx_sdk 10.8 10.9 10.10 10.11 10.12 10.13 10.14; 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}"
@@ -2782,6 +2781,9 @@ if test $_os = Darwin; 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.8--13])
;;
@@ -2821,6 +2823,9 @@ if test $_os = Darwin; 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.8--13])
;;
@@ -2864,6 +2869,9 @@ if test $_os = Darwin; 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.8--13])
;;