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

[Libreoffice Gerrit user]

 README.md    |    2 +-
 configure.ac |   10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

New commits:
commit b4f666f2e677b05cab8395fe7972b45b15f60c3f
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Fri Nov 23 12:11:19 2018 +0100
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Fri Nov 23 17:03:59 2018 +0100

    Bump Xcode baseline to 9.3
    
    ...as discussed at
    <https://lists.freedesktop.org/archives/libreoffice/2018-November/081435.html>
    "minutes of ESC call ..."
    
    Change-Id: I47e23d222b4b27256483dfd7de915dd99ae81317
    Reviewed-on: https://gerrit.libreoffice.org/63878
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/README.md b/README.md
index 39fe759836c6..9192f828be10 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 2017
 * macOS:
     * Runtime: 10.9
-    * Build: 10.12 + Xcode 8
+    * Build: 10.12 + Xcode 9.3
 * Linux:
     * Runtime: RHEL 6 or CentOS 6
     * Build: GCC 4.8.1 or Clang
diff --git a/configure.ac b/configure.ac
index 827b5f6c995e..cddfd825e4a3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2773,6 +2773,16 @@ if test $_os = Darwin -o $_os = iOS; then
     FRAMEWORKSHOME="$MACOSX_SDK_PATH/System/Library/Frameworks"
     MACOSX_DEPLOYMENT_TARGET="$with_macosx_version_min_required"
 
+    AC_MSG_CHECKING([whether Xcode is new enough])
+    my_xcode_ver1=$(xcrun xcodebuild -version | head -n 1)
+    my_xcode_ver2=${my_xcode_ver1#Xcode }
+    my_xcode_ver3=$(printf %s "$my_xcode_ver2" | $AWK -F. '{ print $1*100+($2<100?$2:99) }')
+    if test "$my_xcode_ver3" -ge 903; then
+        AC_MSG_RESULT([yes ($my_xcode_ver2)])
+    else
+        AC_MSG_ERROR(["$my_xcode_ver1" is too old or unrecognized, must be at least Xcode 9.3])
+    fi
+
     case "$with_macosx_version_min_required" in
     10.9)
         MAC_OS_X_VERSION_MIN_REQUIRED="1090"