Index: projects/import-googletest-1.8.1/lib/googletest/Makefile.inc
===================================================================
--- projects/import-googletest-1.8.1/lib/googletest/Makefile.inc	(revision 344422)
+++ projects/import-googletest-1.8.1/lib/googletest/Makefile.inc	(revision 344423)
@@ -1,13 +1,11 @@
 # $FreeBSD$
 
 .include <googletest.test.inc.mk>
 
 GTEST_DIR=	${SRCTOP}/contrib/googletest
 GOOGLEMOCK_SRCROOT= ${GTEST_DIR}/googlemock
 GOOGLETEST_SRCROOT= ${GTEST_DIR}/googletest
 
 CXXFLAGS+=	${GTESTS_FLAGS}
 
-NO_WTHREAD_SAFETY=
-
 WARNS?=		6
Index: projects/import-googletest-1.8.1/share/mk/googletest.test.inc.mk
===================================================================
--- projects/import-googletest-1.8.1/share/mk/googletest.test.inc.mk	(revision 344422)
+++ projects/import-googletest-1.8.1/share/mk/googletest.test.inc.mk	(revision 344423)
@@ -1,12 +1,14 @@
 # $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+= -frtti
 GTESTS_CXXFLAGS+= -std=c++11
 
 # XXX: src.libnames.mk should handle adding this directory.
 GTESTS_CXXFLAGS+= -I${DESTDIR}${INCLUDEDIR}/private
+
+NO_WTHREAD_SAFETY=