configure.ac | 20 ++++++--------------
1 file changed, 6 insertions(+), 14 deletions(-)
New commits:
commit c526b4a58ea6eabf7454566d5e399dbaa3d5d261
Author: Tor Lillqvist <t...@iki.fi>
AuthorDate: Thu Dec 15 01:47:37 2022 +0200
Commit: Tor Lillqvist <t...@collabora.com>
CommitDate: Thu Dec 15 11:45:30 2022 +0000
Simplify selection of iOS SDK, like we now do for macOS
Change-Id: I850a0214d12ef6b5b9a289b34a1467dfe9d35d17
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144213
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist <t...@collabora.com>
diff --git a/configure.ac b/configure.ac
index f90c0c47c97c..cc803db75779 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3634,27 +3634,19 @@ dnl
===================================================================
if test $_os = iOS; then
AC_MSG_CHECKING([what iOS SDK to use])
- current_sdk_ver=16.1
- older_sdk_vers="16.0 15.6"
+
if test "$enable_ios_simulator" = "yes"; then
- platform=iPhoneSimulator
+ platformlc=iphonesimulator
versionmin=-mios-simulator-version-min=14.5
else
- platform=iPhoneOS
+ platformlc=iphoneos
versionmin=-miphoneos-version-min=14.5
fi
- xcode_developer=`xcode-select -print-path`
- for sdkver in $current_sdk_ver $older_sdk_vers; do
-
t=$xcode_developer/Platforms/$platform.platform/Developer/SDKs/$platform$sdkver.sdk
- if test -d $t; then
- sysroot=$t
- break
- fi
- done
+ sysroot=`xcrun --sdk $platformlc --show-sdk-path`
- if test -z "$sysroot"; then
- AC_MSG_ERROR([Could not find iOS SDK, expected something like
$xcode_developer/Platforms/$platform.platform/Developer/SDKs/${platform}${current_sdk_ver}.sdk])
+ if ! test -d "$sysroot"; then
+ AC_MSG_ERROR([Could not find iOS SDK $sysroot])
fi
AC_MSG_RESULT($sysroot)
