Index: src.libnames.mk
===================================================================
--- src.libnames.mk	(revision 274985)
+++ src.libnames.mk	(working copy)
@@ -184,6 +184,10 @@
 LDADD+=		${LDADD_${_l}}
 .endfor
 
+.if defined(USEPRIVATELIB)
+LDFLAGS+=	-rpath ${LIBPRIVATEDIR}
+.endif
+
 LIBATF_CDIR=	${ROOTOBJDIR}/lib/atf/libatf-c
 LDATF_C?=	${LIBATF_CDIR}/libatf-c.so
 LIBATF_C?=	${LIBATF_CDIR}/libatf-c.a
Index: bsd.prog.mk
===================================================================
--- bsd.prog.mk	(revision 274960)
+++ bsd.prog.mk	(working copy)
@@ -51,10 +51,6 @@
 LDFLAGS+= -static
 .endif
 
-.if defined(USEPRIVATELIB)
-LDFLAGS+= -L${_SHLIBDIRPREFIX}${LIBPRIVATEDIR} -rpath ${LIBPRIVATEDIR}
-.endif
-
 .if ${MK_DEBUG_FILES} != "no"
 PROG_FULL=${PROG}.full
 # Use ${DEBUGDIR} for base system debug files, else .debug subdirectory
Index: bsd.lib.mk
===================================================================
--- bsd.lib.mk	(revision 274960)
+++ bsd.lib.mk	(working copy)
@@ -155,10 +155,6 @@
 LDFLAGS+=	-Wl,--version-script=${VERSION_MAP}
 .endif
 
-.if defined(USEPRIVATELIB)
-LDFLAGS+= -rpath ${LIBPRIVATEDIR}
-.endif
-
 .if defined(LIB) && !empty(LIB) || defined(SHLIB_NAME)
 OBJS+=		${SRCS:N*.h:R:S/$/.o/}
 NOPATH_FILES+=	${OBJS}