Move NO_WTHREAD_SAFETY to googletest.test.inc.mk

This variable is necessary to compile with googletest at a global level. Move it there.
2019-02-21 06:49:20 +00:00 · 2019-02-21 06:49:20 +00:00 · 2a1bbdb288
commit 2a1bbdb288
parent f958f5ea89
2 changed files with 2 additions and 2 deletions
--- a/lib/googletest/Makefile.inc
+++ b/lib/googletest/Makefile.inc
@ -8,6 +8,4 @@ GOOGLETEST_SRCROOT= ${GTEST_DIR}/googletest

 CXXFLAGS+=	${GTESTS_FLAGS}

-NO_WTHREAD_SAFETY=
-
 WARNS?=		6
--- a/share/mk/googletest.test.inc.mk
+++ b/share/mk/googletest.test.inc.mk
@ -10,3 +10,5 @@ GTESTS_CXXFLAGS+= -std=c++11

 # XXX: src.libnames.mk should handle adding this directory.
 GTESTS_CXXFLAGS+= -I${DESTDIR}${INCLUDEDIR}/private
+
+NO_WTHREAD_SAFETY=