[Libreoffice-commits] core.git: configure.ac README.md

Noel Grandin noel.grandin at collabora.co.uk
Tue Oct 3 14:18:39 UTC 2017


 README.md    |    2 +-
 configure.ac |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 372d2d78906aac32ddaf7eaa3c2037ea3d5af1ae
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date:   Tue Sep 19 09:53:18 2017 +0200

    Update OSX SDK checking
    
    We require a min of 10.12 to build these days.
    Also reverse the order of the list in configure.ac so that we pick up
    newer SDK before older SDK.
    
    Change-Id: Iae25f1971123479801a82c9d30172668a4cfa52a
    Reviewed-on: https://gerrit.libreoffice.org/42450
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/README.md b/README.md
index 0c29c3ed06a9..c407d6c09c3c 100644
--- a/README.md
+++ b/README.md
@@ -37,7 +37,7 @@ run and compile LibreOffice, also used by the TDF builds:
  * Build: Cygwin + Visual Studio 2015 Update 3
 * macOS:
  * Runtime: 10.9
- * Build: 10.11 + Xcode 8
+ * Build: 10.12 + Xcode 8
 * Linux:
  * Runtime: RHEL 6 or CentOS 6
  * Build: GCC 4.8.1 or Clang
diff --git a/configure.ac b/configure.ac
index 204241efc67b..3b02041874b4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2633,7 +2633,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.9 10.10 10.11 10.12 10.13; do
+    for _macosx_sdk in $with_macosx_sdk 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}"


More information about the Libreoffice-commits mailing list