From 2a1bbdb28871d19222d8e2899b3d6085660c23ad Mon Sep 17 00:00:00 2001 From: ngie Date: Thu, 21 Feb 2019 06:49:20 +0000 Subject: [PATCH] Move `NO_WTHREAD_SAFETY` to googletest.test.inc.mk This variable is necessary to compile with googletest at a global level. Move it there. --- lib/googletest/Makefile.inc | 2 -- share/mk/googletest.test.inc.mk | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/googletest/Makefile.inc b/lib/googletest/Makefile.inc index 5d3222736e6b..cf6e98b5d8ab 100644 --- 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 diff --git a/share/mk/googletest.test.inc.mk b/share/mk/googletest.test.inc.mk index b632c909e088..dc0cfb7c8b39 100644 --- 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=