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
commit 3d8a7236ddb98bc9653d127c017b4e0e504cd1d1 Author: Jim Jagielski <[email protected]> AuthorDate: Tue Feb 2 14:46:36 2021 -0500 Force correct C++ versions --- main/configure.ac | 2 +- main/odk/settings/settings.mk | 6 +++--- 2 files changed, 4 insertions(+), 4 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
