Date: Thu, 21 Feb 2019 06:49:20 +0000 (UTC) From: Enji Cooper <ngie@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r344423 - in projects/import-googletest-1.8.1: lib/googletest share/mk Message-ID: <201902210649.x1L6nKR9013351@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ngie Date: Thu Feb 21 06:49:20 2019 New Revision: 344423 URL: https://svnweb.freebsd.org/changeset/base/344423 Log: Move `NO_WTHREAD_SAFETY` to googletest.test.inc.mk This variable is necessary to compile with googletest at a global level. Move it there. Modified: projects/import-googletest-1.8.1/lib/googletest/Makefile.inc projects/import-googletest-1.8.1/share/mk/googletest.test.inc.mk Modified: projects/import-googletest-1.8.1/lib/googletest/Makefile.inc ============================================================================== --- projects/import-googletest-1.8.1/lib/googletest/Makefile.inc Thu Feb 21 06:40:15 2019 (r344422) +++ projects/import-googletest-1.8.1/lib/googletest/Makefile.inc Thu Feb 21 06:49:20 2019 (r344423) @@ -8,6 +8,4 @@ GOOGLETEST_SRCROOT= ${GTEST_DIR}/googletest CXXFLAGS+= ${GTESTS_FLAGS} -NO_WTHREAD_SAFETY= - WARNS?= 6 Modified: projects/import-googletest-1.8.1/share/mk/googletest.test.inc.mk ============================================================================== --- projects/import-googletest-1.8.1/share/mk/googletest.test.inc.mk Thu Feb 21 06:40:15 2019 (r344422) +++ projects/import-googletest-1.8.1/share/mk/googletest.test.inc.mk Thu Feb 21 06:49:20 2019 (r344423) @@ -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=
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201902210649.x1L6nKR9013351>