Revert r345706: the third time will be the charm

When a review is closed via Phabricator it updates the patch attached to the
review. I downloaded the raw patch from Phabricator, applied it, and repeated
my mistake from r345704 by accident mixing content from D19732 and D19738.

For my own personal sanity, I will try not to mix reviews like this in the
future.

MFC after:	1 month
MFC with:	r345706
Approved by:	emaste (mentor, implicit)

This commit is contained in:

Enji Cooper

2019-03-29 18:43:46 +00:00

parent 760b1a815b

commit bdbf3440ce

15 changed files with 31 additions and 28 deletions

									
										share/mk/googletest.test.inc.mk
									
		+4
		
												View File
												
				@@ -1,9 +1,13 @@

				# $FreeBSD$

				# XXX: this should be defined in bsd.sys.mk

				CXXSTD?=	c++11

				GTESTS_CXXFLAGS+= -DGTEST_HAS_POSIX_RE=1

				GTESTS_CXXFLAGS+= -DGTEST_HAS_PTHREAD=1

				GTESTS_CXXFLAGS+= -DGTEST_HAS_STREAM_REDIRECTION=1

				GTESTS_CXXFLAGS+= -frtti

				GTESTS_CXXFLAGS+= -std=${CXXSTD}

				# XXX: src.libnames.mk should handle adding this directory for libgtest's,

				# libgmock's, etc, headers.