From owner-svn-src-head@freebsd.org  Thu Mar 28 17:22:33 2019
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id E3577156372E;
 Thu, 28 Mar 2019 17:22:32 +0000 (UTC)
 (envelope-from ngie@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 server-signature RSA-PSS (4096 bits)
 client-signature RSA-PSS (4096 bits) client-digest SHA256)
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 8953E8276C;
 Thu, 28 Mar 2019 17:22:32 +0000 (UTC)
 (envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 5B8952258B;
 Thu, 28 Mar 2019 17:22:32 +0000 (UTC)
 (envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x2SHMWvP076399;
 Thu, 28 Mar 2019 17:22:32 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id x2SHMWrK076398;
 Thu, 28 Mar 2019 17:22:32 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201903281722.x2SHMWrK076398@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ngie set sender to
 ngie@FreeBSD.org using -f
From: Enji Cooper <ngie@FreeBSD.org>
Date: Thu, 28 Mar 2019 17:22:32 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r345645 - head/share/mk
X-SVN-Group: head
X-SVN-Commit-Author: ngie
X-SVN-Commit-Paths: head/share/mk
X-SVN-Commit-Revision: 345645
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Rspamd-Queue-Id: 8953E8276C
X-Spamd-Bar: --
Authentication-Results: mx1.freebsd.org
X-Spamd-Result: default: False [-2.95 / 15.00];
 local_wl_from(0.00)[FreeBSD.org];
 NEURAL_HAM_MEDIUM(-1.00)[-0.996,0];
 NEURAL_HAM_SHORT(-0.96)[-0.957,0];
 ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US];
 NEURAL_HAM_LONG(-1.00)[-1.000,0]
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 28 Mar 2019 17:22:33 -0000

Author: ngie
Date: Thu Mar 28 17:22:31 2019
New Revision: 345645
URL: https://svnweb.freebsd.org/changeset/base/345645

Log:
  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

Modified:
  head/share/mk/googletest.test.inc.mk

Modified: head/share/mk/googletest.test.inc.mk
==============================================================================
--- head/share/mk/googletest.test.inc.mk	Thu Mar 28 16:17:33 2019	(r345644)
+++ head/share/mk/googletest.test.inc.mk	Thu Mar 28 17:22:31 2019	(r345645)
@@ -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=