Get macOS building nss again... Problem was that using env for CXX didn't correctly handle the required options
diff --git a/main/configure.ac b/main/configure.ac
index 51522cc..12956e2 100644
--- a/main/configure.ac
+++ b/main/configure.ac
@@ -1160,6 +1160,11 @@
 		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 a643278..18016e4 100644
--- a/main/nss/nss.patch
+++ b/main/nss/nss.patch
@@ -82,7 +82,7 @@
 -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