Index: lib/googletest/tests/Makefile.inc
===================================================================
--- lib/googletest/tests/Makefile.inc
+++ lib/googletest/tests/Makefile.inc
@@ -4,3 +4,14 @@
 # Keep the existing tests directory structure (with subdirs per component)
 # rather than installing all of them to /usr/tests/lib/googletest
 TESTSDIR=	${TESTSBASE}/lib/googletest/${.CURDIR:T}
+
+# Clang's optimizer spends an really long time on these tests at -O2, so use -O1
+# instead. This reduces the -j32 time for lib/googletest/test from 131s to 71s.
+# Note: Building without debug info saves about 10-15% of the build time, so we
+# only enable debug info if DEBUG_FLAGS is not empty (71s -> 64s at -j32).
+# TODO: -O0 reduces the time to 29s, so maybe we should default to that?
+CFLAGS.clang+=	-O1
+.if empty(DEBUG_FLAGS)
+MK_DEBUG_FILES:=no
+CFLAGS.clang+=	-g0
+.endif