Index: projects/import-googletest-1.8.1/lib/googletest/gtest/tests/Makefile
===================================================================
--- projects/import-googletest-1.8.1/lib/googletest/gtest/tests/Makefile	(revision 344415)
+++ projects/import-googletest-1.8.1/lib/googletest/gtest/tests/Makefile	(revision 344416)
@@ -1,45 +1,46 @@
 # $FreeBSD$
 
 .include <bsd.init.mk>
 
 .PATH:	${GOOGLETEST_SRCROOT}/src ${GOOGLETEST_SRCROOT}/test
 
-GTESTS+=	gtest-death-test_ex_catch_test
-GTESTS+=	gtest-death-test_ex_nocatch_test
 GTESTS+=	gtest_environment_test
 GTESTS+=	gtest_no_test_unittest
 GTESTS+=	googletest-param-test-test
 GTESTS+=	gtest_premature_exit_test
 GTESTS+=	gtest_repeat_test
 GTESTS+=	gtest_stress_test
 GTESTS+=	gtest_throw_on_failure_ex_test
 GTESTS+=	gtest-unittest-api_test
 
 CXXFLAGS+=	-I${GOOGLETEST_SRCROOT}/include
 CXXFLAGS+=	-I${GOOGLETEST_SRCROOT}
 
-gtest-death-test_ex_catch_test.cc gtest-death-test_ex_nocatch_test.cc: googletest-death-test_ex_test.cc
+.for death_test in gtest-death-test_ex_catch_test gtest-death-test_ex_nocatch_test
+# XXX: copying source files in order to tweak CXXFLAGS seems hacky.
+${death_test}.cc: googletest-death-test_ex_test.cc
 	${CP} ${.ALLSRC} ${.TARGET}
+CLEANFILES+=	${death_test}.cc
+CXXFLAGS.${death_test}+= -fexception
+.endfor
 
-CXXFLAGS.gtest-death-test_ex_catch_test+=       \
-	-DGTEST_ENABLE_CATCH_EXCEPTIONS_=1	\
-	-fexceptions
+CXXFLAGS.gtest-death-test_ex_catch_test+=	\
+	-DGTEST_ENABLE_CATCH_EXCEPTIONS_=1
 
 CXXFLAGS.gtest-death-test_ex_nocatch_test+=     \
-	-DGTEST_ENABLE_CATCH_EXCEPTIONS_=0	\
-	-fexceptions
+	-DGTEST_ENABLE_CATCH_EXCEPTIONS_=0
 
 SRCS.googletest-param-test-test=	\
 	googletest-param-test-test.cc	\
 	googletest-param-test2-test.cc
 
 LIBADD+=	gtest
 
 # XXX: explicitly listing -lpthread is incorrect. src.libnames.mk should be
 #      handling this.
 LIBADD.gtest_stress_test+=	pthread
 
 # XXX: https://github.com/google/googletest/pull/2119
 NO_WERROR=
 
 .include <bsd.test.mk>