From 7b1136bd5927731f58fa3d223cc3c2ccb58e3320 Mon Sep 17 00:00:00 2001 From: Enji Cooper Date: Fri, 22 Feb 2019 04:52:12 +0000 Subject: [PATCH] Remove redundant CXXFLAGS and fix constant names - Specifying -std=c++11 and -frtti tweaks those flags with clang/gcc. - The constants are prefixed with `GTEST_`, not `GTESTS_`. --- share/mk/googletest.test.inc.mk | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/share/mk/googletest.test.inc.mk b/share/mk/googletest.test.inc.mk index dc0cfb7c8b39..8f9b8400c8b8 100644 --- a/share/mk/googletest.test.inc.mk +++ b/share/mk/googletest.test.inc.mk @@ -1,10 +1,8 @@ # $FreeBSD$ -GTESTS_CXXFLAGS+= -DGTESTS_HAS_RTTI=1 -GTESTS_CXXFLAGS+= -DGTESTS_HAS_POSIX_RE=1 -GTESTS_CXXFLAGS+= -DGTESTS_HAS_PTHREAD=1 -GTESTS_CXXFLAGS+= -DGTESTS_HAS_STREAM_REDIRECTION=1 -GTESTS_CXXFLAGS+= -DGTESTS_LANG_CXX11=1 +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=c++11