[openoffice] branch trunk updated: Get macOS building nss again... Problem was that using env for CXX didn't correctly handle the required options

[ji...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

jim pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/openoffice.git


The following commit(s) were added to refs/heads/trunk by this push:
     new 8cbbd4e896 Get macOS building nss again... Problem was that using env for CXX didn't correctly handle the required options
8cbbd4e896 is described below

commit 8cbbd4e89632851a5c403bc49fa61e6f018e19ec
Author: Jim Jagielski <ji...@gmail.com>
AuthorDate: Tue Dec 20 08:26:50 2022 -0500

    Get macOS building nss again... Problem was that using env for CXX didn't correctly handle the required options
    
    (cherry picked from commit a46cde238bcc9fcb215fd69191f37e44479632df)
---
 main/configure.ac  | 5 +++++
 main/nss/nss.patch | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/main/configure.ac b/main/configure.ac
index 7273d9fc9f..52d313d430 100644
--- a/main/configure.ac
+++ b/main/configure.ac
@@ -1151,6 +1151,11 @@ case "$build_os" in
 		fi
 		if test ! -n "$CXX"; then
 		   CXX="`xcrun -f clang++` -std=c++11 -stdlib=libc++ -arch x86_64"
+		   macos_c11=`pwd`/macos_c11
+		   echo "#!/bin/sh" > $macos_c11
+		   echo "$CXX \$@" >> $macos_c11
+		   chmod 755 $macos_c11
+		   CXX="$macos_c11"
 		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/nss/nss.patch b/main/nss/nss.patch
index a643278e69..18016e4c0e 100644
--- a/main/nss/nss.patch
+++ b/main/nss/nss.patch
@@ -82,7 +82,7 @@ diff -ur misc/nss-3.39/nss/coreconf/Darwin.mk misc/build/nss-3.39/nss/coreconf/D
 -CCC    ?= g++
 +# CC is taken from environment automatically.
 +#CC     ?= gcc
-+CCC    ?= $(CXX) -stdlib=libc++ -std=c++11
++CCC    ?= $(CXX)
  RANLIB ?= ranlib
  
  include $(CORE_DEPTH)/coreconf/UNIX.mk