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 3ab3c18 Be SDK 11.0 aware for macOS builds and Xcode 12.2 (and Big
Sur)
new bbb0395 Merge branch 'AOO42X' of
https://gitbox.apache.org/repos/asf/openoffice into AOO42X
3ab3c18 is described below
commit 3ab3c188d768600a2512e0eccd7c888cb27f97c9
Author: Jim Jagielski <[email protected]>
AuthorDate: Fri Nov 13 09:50:42 2020 -0500
Be SDK 11.0 aware for macOS builds and Xcode 12.2 (and Big Sur)
---
main/configure.ac | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/main/configure.ac b/main/configure.ac
index efaa80e..b18a268 100644
--- a/main/configure.ac
+++ b/main/configure.ac
@@ -3943,7 +3943,12 @@ if test "$_os" = "Darwin"; then
MACOSX_DEPLOYMENT_TARGET=$sdk_target
dnl Why not MacOSX10.9.sdk? It lacks Python.h (!?)
+ dnl First look for macOS10.x SDKs (Up thru Xcode 12.1)
sdk_found=`xcodebuild -showsdks | $EGREP "sdk
macosx10.(7|8|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`
+ fi
if test -z "$sdk_found"; then
AC_MSG_ERROR([No SDK with OSX $sdk_target compatibility found])
else
