[Libreoffice-commits] core.git: 3 commits - configure.ac

[Tor Lillqvist (via logerrit)]

 configure.ac |   15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

New commits:
commit 48df1a3f665ba843be6fa99bec8fd5796ec096fb
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Mon Sep 23 14:16:19 2019 +0300
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Mon Sep 23 14:43:54 2019 +0300

    Let's not bother looking for quite old iOS SDKs
    
    Change-Id: I449d5fe425d741ca3b4a3be84e7e2bc015e90e32

diff --git a/configure.ac b/configure.ac
index a47f16a4d4c6..88c512c2635f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3007,7 +3007,7 @@ dnl ===================================================================
 if test $_os = iOS; then
     AC_MSG_CHECKING([what iOS SDK to use])
     current_sdk_ver=13.0
-    older_sdk_vers="12.4 12.2 12.1 12.0 11.4"
+    older_sdk_vers="12.4 12.2"
     if test "$enable_ios_simulator" = "yes"; then
         platform=iPhoneSimulator
         versionmin=-mios-simulator-version-min=11.0
commit 9997f5fa056205fad58162dc0d2ce2d5d6b81ce8
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Mon Sep 23 14:15:09 2019 +0300
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Mon Sep 23 14:43:54 2019 +0300

    iOS SDK 13.0 is the current version
    
    Change-Id: Icd8455ce122530e69f01b8345cbd02925305429f

diff --git a/configure.ac b/configure.ac
index 13046e36cc9a..a47f16a4d4c6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3006,8 +3006,8 @@ dnl ===================================================================
 
 if test $_os = iOS; then
     AC_MSG_CHECKING([what iOS SDK to use])
-    current_sdk_ver=12.4
-    older_sdk_vers="13.0 12.2 12.1 12.0 11.4"
+    current_sdk_ver=13.0
+    older_sdk_vers="12.4 12.2 12.1 12.0 11.4"
     if test "$enable_ios_simulator" = "yes"; then
         platform=iPhoneSimulator
         versionmin=-mios-simulator-version-min=11.0
commit 8b86d412051041093540a25e1e19c1322a68cb7a
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Mon Sep 23 14:13:13 2019 +0300
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Mon Sep 23 14:43:53 2019 +0300

    This if branch is for macOS, not iOS
    
    Change-Id: I4a502d4247bf86fd2bc5734a64e600ae0e214f21

diff --git a/configure.ac b/configure.ac
index 51767f9c537a..13046e36cc9a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2749,7 +2749,7 @@ dnl ===================================================================
 dnl Check macOS SDK and compiler
 dnl ===================================================================
 
-if test $_os = Darwin -o $_os = iOS; then
+if test $_os = Darwin; then
 
     # If no --with-macosx-sdk option is given, look for one
 
@@ -2777,17 +2777,8 @@ if test $_os = Darwin -o $_os = iOS; then
         AC_MSG_ERROR([Could not find an appropriate macOS SDK])
     fi
 
-    if test $_os = iOS; then
-        if test "$enable_ios_simulator" = "yes"; then
-            useos=iphonesimulator
-        else
-            useos=iphoneos
-        fi
-        MACOSX_SDK_PATH=`xcrun --sdk ${useos} --show-sdk-path 2> /dev/null`
-    fi
     AC_MSG_RESULT([SDK $with_macosx_sdk at $MACOSX_SDK_PATH])
 
-
     case $with_macosx_sdk in
     10.12)
         MACOSX_SDK_VERSION=101200