You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ji...@apache.org on 2020/12/15 13:49:58 UTC
[openoffice] branch AOO42X updated: Xcode 12.3 aware
This is an automated email from the ASF dual-hosted git repository.
jim pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/AOO42X by this push:
new f90c0f8 Xcode 12.3 aware
f90c0f8 is described below
commit f90c0f881fc8819c11cf3067b9d95f9203493072
Author: Jim Jagielski <ji...@gmail.com>
AuthorDate: Tue Dec 15 08:49:13 2020 -0500
Xcode 12.3 aware
(cherry picked from commit 65ec1307dba2738f97d69a4cbef009c127f345e1)
---
main/configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/main/configure.ac b/main/configure.ac
index 3951898..56cd131 100644
--- a/main/configure.ac
+++ b/main/configure.ac
@@ -3901,7 +3901,7 @@ if test "$_os" = "Darwin"; then
sdk_found=`xcodebuild -showsdks | $EGREP "sdk macosx10.(10|11|12|13|14|15)" | sed -e "s/.*sdk //" | tail -n1`
dnl If not found, look for macOS11.x SDKs (Xcode 12.2 and later)
if test -z "$sdk_found"; then
- sdk_found=`xcodebuild -showsdks | $EGREP "sdk macosx11.(0)" | sed -e "s/.*sdk //" | tail -n1`
+ sdk_found=`xcodebuild -showsdks | $EGREP "sdk macosx11.(0|1)" | sed -e "s/.*sdk //" | tail -n1`
fi
if test -z "$sdk_found"; then
AC_MSG_ERROR([No SDK with OSX $sdk_target compatibility found])