[openoffice] branch AOO42X updated: Allow for more recent macOS SDKs

[jim]

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 0e91ffb  Allow for more recent macOS SDKs
     new 816a3e5  Merge branch 'AOO42X' of 
https://gitbox.apache.org/repos/asf/openoffice into AOO42X
0e91ffb is described below

commit 0e91ffb34ff665b8cb086b220ef09aa973ace3e5
Author: Jim Jagielski <jim...@gmail.com>
AuthorDate: Wed Sep 30 09:24:40 2020 -0400

    Allow for more recent macOS SDKs
---
 main/config.guess | 0
 main/configure.ac | 4 ++--
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/main/config.guess b/main/config.guess
old mode 100644
new mode 100755
diff --git a/main/configure.ac b/main/configure.ac
index 2849105..ec985fd 100644
--- a/main/configure.ac
+++ b/main/configure.ac
@@ -1154,7 +1154,7 @@ case "$build_os" in
                   CC="`xcrun -f clang` -arch x86_64"
                fi
                if test ! -n "$CXX"; then
-                  CXX="`xcrun -f clang++` -arch x86_64"
+                  CXX="`xcrun -f clang++` -stdlib=libc++ -arch x86_64"
                fi
                # Don't use OSVERSION until we know no conflicts result from it
                _darwin_version="`uname -r | $AWK -F . '{ print $1 }'`"
@@ -3943,7 +3943,7 @@ if test  "$_os" = "Darwin"; then
       MACOSX_DEPLOYMENT_TARGET=$sdk_target
 
       dnl Why not MacOSX10.9.sdk? It lacks Python.h (!?)
-      sdk_found=`xcodebuild -showsdks | $EGREP "sdk macosx10.(7|8|10|11)" | 
sed -e "s/.*sdk //" | tail -n1`
+      sdk_found=`xcodebuild -showsdks | $EGREP "sdk 
macosx10.(7|8|10|11|12|13|14|15)" | sed -e "s/.*sdk //" | tail -n1`
       if test -z "$sdk_found"; then
          AC_MSG_ERROR([No SDK with OSX $sdk_target compatibility found])
       else