Kaydet (Commit) c6af7bc0 authored tarafından Stephan Bergmann's avatar Stephan Bergmann Kaydeden (comit) Andras Timar

macOS SDK 10.14 is out

Reviewed-on: https://gerrit.libreoffice.org/60657
Tested-by: Jenkins
Reviewed-by: 's avatarStephan Bergmann <sbergman@redhat.com>
(cherry picked from commit a8eb5155)

Change-Id: Iab7bc66db94fe02bb3714234d68b3e2fc3569fdf
üst 3a31948a
...@@ -2618,7 +2618,7 @@ if test $_os = Darwin -o $_os = iOS; then ...@@ -2618,7 +2618,7 @@ if test $_os = Darwin -o $_os = iOS; then
# higher than or equal to the minimum required should be found. # higher than or equal to the minimum required should be found.
AC_MSG_CHECKING([what Mac OS X SDK to use]) 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` MACOSX_SDK_PATH=`xcrun --sdk macosx${_macosx_sdk} --show-sdk-path 2> /dev/null`
if test -d "$MACOSX_SDK_PATH"; then if test -d "$MACOSX_SDK_PATH"; then
with_macosx_sdk="${_macosx_sdk}" with_macosx_sdk="${_macosx_sdk}"
...@@ -2662,6 +2662,9 @@ if test $_os = Darwin -o $_os = iOS; then ...@@ -2662,6 +2662,9 @@ if test $_os = Darwin -o $_os = iOS; then
10.13) 10.13)
MACOSX_SDK_VERSION=101300 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]) 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 ...@@ -2698,6 +2701,9 @@ if test $_os = Darwin -o $_os = iOS; then
10.13) 10.13)
MAC_OS_X_VERSION_MIN_REQUIRED="101300" 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]) 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 ...@@ -2739,6 +2745,9 @@ if test $_os = Darwin -o $_os = iOS; then
10.13) 10.13)
MAC_OS_X_VERSION_MAX_ALLOWED="101300" 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]) AC_MSG_ERROR([with-macosx-version-max-allowed $with_macosx_version_max_allowed is not a supported value, supported values are 10.9--13])
;; ;;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment