[openoffice] branch AOO42X updated: No longer support 10.7/10.8

[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 530c830  No longer support 10.7/10.8
530c830 is described below

commit 530c83014bcf6ffc1a7778591c69217b12b0575d
Author: Jim Jagielski <jim...@gmail.com>
AuthorDate: Tue Feb 2 16:12:41 2021 -0500

    No longer support 10.7/10.8
---
 main/configure.ac                     | 2 +-
 main/odk/settings/settings.mk         | 6 +++---
 main/solenv/gbuild/platform/macosx.mk | 5 -----
 3 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/main/configure.ac b/main/configure.ac
index 39dbd6c..a4483d4 100644
--- a/main/configure.ac
+++ b/main/configure.ac
@@ -1159,7 +1159,7 @@ case "$build_os" in
                   CC="`xcrun -f clang` -arch x86_64"
                fi
                if test ! -n "$CXX"; then
-                  CXX="`xcrun -f clang++` -stdlib=libc++ -arch x86_64"
+                  CXX="`xcrun -f clang++` -std=c++11 -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 }'`"
diff --git a/main/odk/settings/settings.mk b/main/odk/settings/settings.mk
index 75edf28..24d6723 100644
--- a/main/odk/settings/settings.mk
+++ b/main/odk/settings/settings.mk
@@ -402,9 +402,9 @@ OS=MACOSX
 PS=/
 ICL=\$$
 CC=`xcrun -f clang` -arch x86_64
-CXX=`xcrun -f clang++` -arch x86_64 -std=c++11
-LINK=`xcrun -f clang++` -arch x86_64 -std=c++11
-LIB=`xcrun -f clang++` -arch x86_64 -std=c++11
+CXX=`xcrun -f clang++` -arch x86_64 -std=c++11 -stdlib=libc++
+LINK=`xcrun -f clang++` -arch x86_64 -std=c++11 -stdlib=libc++
+LIB=`xcrun -f clang++` -arch x86_64 -std=c++11 -stdlib=libc++
 INSTALLTOOL=`xcrun -f install_name_tool`
 
 ECHO=@echo
diff --git a/main/solenv/gbuild/platform/macosx.mk 
b/main/solenv/gbuild/platform/macosx.mk
index 7ea8c7a..0928dc5 100644
--- a/main/solenv/gbuild/platform/macosx.mk
+++ b/main/solenv/gbuild/platform/macosx.mk
@@ -103,11 +103,6 @@ ifneq ($(COM),GCC)
        gb_CXXFLAGS += -DHAVE_STL_INCLUDE_PATH -I../v1/
 endif
 
-ifeq ($(MACOSX_DEPLOYMENT_TARGET),$(filter $(MACOSX_DEPLOYMENT_TARGET), 10.7 
10.8))
-       gb_CXXFLAGS += -std=c++11 -stdlib=libc++
-       gb_macos_LDFLAGS := -std=c++11 -stdlib=libc++
-endif
-
 # these are to get g++ to switch to Objective-C++ mode
 # (see toolkit module for a case where it is necessary to do it this way)
 gb_OBJCFLAGS := -x objective-c -fobjc-exceptions