From fb72cf61acae558babd505379061aa081a13c4f0 Mon Sep 17 00:00:00 2001
From: Enji Cooper <ngie@FreeBSD.org>
Date: Thu, 28 Mar 2019 17:22:31 +0000
Subject: [PATCH] Spam CXXFLAGS with `-I${DESTDIR}/usr/include/private`,
 instead of GTEST_CXXFLAGS

This makes it easier for googletest users to leverage googletest, instead of
forcing them to plug GTEST_CXXFLAGS into CXXFLAGS manually (resulting in
unnecessary duplication).

I will be following this up with a more proper fix in src.libnames.mk, as
src.libnames.mk should be automatically adding this directory to
CFLAGS/CXXFLAGS when private libraries are referenced. Not doing so can result
in mismatches between base-provided private library's and ports-provided
library's headers.

While here, tweak the comment to clarify what the intent is behind spamming
CXXFLAGS.

MFC after:	5 weeks
MFC with:	r345203
Reported by:	asomers
Reviewed by:	asomers
Approved by:	emaste (mentor)
Differential Revision: https://reviews.freebsd.org/D19731
---
 share/mk/googletest.test.inc.mk | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/share/mk/googletest.test.inc.mk b/share/mk/googletest.test.inc.mk
index c38be7adb353..84959658bdbd 100644
--- a/share/mk/googletest.test.inc.mk
+++ b/share/mk/googletest.test.inc.mk
@@ -9,7 +9,8 @@ GTESTS_CXXFLAGS+= -DGTEST_HAS_STREAM_REDIRECTION=1
 GTESTS_CXXFLAGS+= -frtti
 GTESTS_CXXFLAGS+= -std=${CXXSTD}
 
-# XXX: src.libnames.mk should handle adding this directory.
-GTESTS_CXXFLAGS+= -I${DESTDIR}${INCLUDEDIR}/private
+# XXX: src.libnames.mk should handle adding this directory for libgtest's,
+# libgmock's, etc, headers.
+CXXFLAGS+=	-I${DESTDIR}${INCLUDEDIR}/private
 
 NO_WTHREAD_SAFETY=