Revert r345704

I accidentally committed code from two reviews. I will reintroduce the code to
bsd.progs.mk as part of a separate commit from r345704.

Approved by:	emaste (mentor, implicit)
MFC after:	2 months
MFC with:	r345704

This commit is contained in:

Enji Cooper

2019-03-29 18:16:33 +00:00

parent 9a41926bfb

commit 752cabaa1c

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.