README.md | 2 +-
configure.ac | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 3469f6976c9435d1235315439e95beb9494bd8eb
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Thu Jan 13 16:54:33 2022 +0100
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Thu Feb 24 17:25:10 2022 +0100
Bump macOS build baseline to Xcode 12.5 and macOS 11.0
...as announced at
<https://lists.freedesktop.org/archives/libreoffice/2022-January/088320.html>
"Bump macOS build baseline to Xcode 12.5 and macOS 11.0 [was:
std::optional::value]". (The immediate benefit is that
std::optional::value can
now be used and no longer triggers bogus "'value' is unavailable:
introduced in
macOS 10.14" errors depending on which version of Xcode is being used; see
<https://lists.freedesktop.org/archives/libreoffice/2022-January/088314.html>
"std::optional::value" for details.)
Change-Id: I819d8dfebabefc22c6af275154df0ff52ca77f5c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128384
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/README.md b/README.md
index 5679f779be46..31383800dc10 100644
--- a/README.md
+++ b/README.md
@@ -39,7 +39,7 @@ run and compile LibreOffice, also used by the TDF builds:
* Build: Cygwin + Visual Studio 2019 version 16.5
* macOS:
* Runtime: 10.13
- * Build: 10.14.4 + Xcode 11.3
+ * Build: 11.0 + Xcode 12.5
* Linux:
* Runtime: RHEL 7 or CentOS 7
* Build: either GCC 7.0.0; or Clang 8.0.1 with libstdc++ 7.3.0
diff --git a/configure.ac b/configure.ac
index 37fe3ff27ec2..35c543d8a6aa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3489,10 +3489,10 @@ if test $_os = Darwin; then
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 1103; then
+ if test "$my_xcode_ver3" -ge 1205; 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 11.3])
+ AC_MSG_ERROR(["$my_xcode_ver1" is too old or unrecognized, must be at
least Xcode 12.5])
fi
case "$with_macosx_version_min_required" in
