Index: projects/import-googletest-1.8.1/lib/googletest/gmock_main/Makefile
===================================================================
--- projects/import-googletest-1.8.1/lib/googletest/gmock_main/Makefile	(revision 344323)
+++ projects/import-googletest-1.8.1/lib/googletest/gmock_main/Makefile	(revision 344324)
@@ -1,20 +1,24 @@
 # $FreeBSD$
 
 .include <bsd.init.mk>
 
 .PATH:	${GOOGLEMOCK_SRCROOT}/include ${GOOGLEMOCK_SRCROOT}/src
 
 LIB_CXX=	gmock_main
 SHLIB_MAJOR=	0
 PRIVATELIB=	true
 
 CXXFLAGS+=	-I${GOOGLEMOCK_SRCROOT}/include
 CXXFLAGS+=	-I${GOOGLEMOCK_SRCROOT}
 CXXFLAGS+=	-I${GOOGLETEST_SRCROOT}/include
 
-LIBADD=		gmock
+LIBADD+=	gmock
+# NB: LDFLAGS added for buildworld builds
+LDFLAGS+=	-L${LIBGTESTDIR}
+LDFLAGS+=	-L${LIBGMOCKDIR}
+
 SRCS+=		gmock_main.cc
 
 SUBDIR.${MK_TESTS}+=	tests
 
 .include <bsd.lib.mk>
Index: projects/import-googletest-1.8.1/lib/googletest/gtest_main/Makefile
===================================================================
--- projects/import-googletest-1.8.1/lib/googletest/gtest_main/Makefile	(revision 344323)
+++ projects/import-googletest-1.8.1/lib/googletest/gtest_main/Makefile	(revision 344324)
@@ -1,18 +1,22 @@
 # $FreeBSD$
 
 .include <bsd.init.mk>
 
 .PATH:	${GOOGLETEST_SRCROOT}/include ${GOOGLETEST_SRCROOT}/src
 
 LIB_CXX=	gtest_main
 SHLIB_MAJOR=	0
 PRIVATELIB=	true
 
 CXXFLAGS+=	-I${GOOGLETEST_SRCROOT}/include
 CXXFLAGS+=	-I${GOOGLETEST_SRCROOT}
 
+LIBADD+=	gtest
+# NB: LDFLAGS added for buildworld builds
+LDFLAGS+=	-L${LIBGTESTDIR}
+
 SRCS+=		gtest_main.cc
 
 SUBDIR.${MK_TESTS}+=	tests
 
 .include <bsd.lib.mk>