From 6629c75a21bdad4598e6e538d1368601bc94b9fc Mon Sep 17 00:00:00 2001
From: jhb <jhb@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Date: Fri, 13 Mar 2015 17:45:34 +0000
Subject: [PATCH] MFC 278682: Make the extra dependencies in DPADD be
 dependencies of PROG_FULL and SHLIB_NAME_FULL so that the full binary is
 relinked when a dependency changes.  Right now the existing full binary is
 left as-is and only the objcopy to remove debug symbols is run.

git-svn-id: svn://svn.freebsd.org/base/stable/10@279958 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
---
 share/mk/bsd.lib.mk  | 2 +-
 share/mk/bsd.prog.mk | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk
index 95d465a18..3ea0da877 100644
--- a/share/mk/bsd.lib.mk
+++ b/share/mk/bsd.lib.mk
@@ -276,7 +276,7 @@ _EXTRADEPEND:
 	mv $$TMP ${DEPENDFILE}
 .if !defined(NO_EXTRADEPEND) && defined(SHLIB_NAME)
 .if defined(DPADD) && !empty(DPADD)
-	echo ${SHLIB_NAME}: ${DPADD} >> ${DEPENDFILE}
+	echo ${SHLIB_NAME_FULL}: ${DPADD} >> ${DEPENDFILE}
 .endif
 .endif
 
diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk
index 6c2effb09..ab517841f 100644
--- a/share/mk/bsd.prog.mk
+++ b/share/mk/bsd.prog.mk
@@ -167,15 +167,15 @@ CLEANFILES+= ${OBJS}
 _EXTRADEPEND:
 .if defined(LDFLAGS) && !empty(LDFLAGS:M-nostdlib)
 .if defined(DPADD) && !empty(DPADD)
-	echo ${PROG}: ${DPADD} >> ${DEPENDFILE}
+	echo ${PROG_FULL}: ${DPADD} >> ${DEPENDFILE}
 .endif
 .else
-	echo ${PROG}: ${LIBC} ${DPADD} >> ${DEPENDFILE}
+	echo ${PROG_FULL}: ${LIBC} ${DPADD} >> ${DEPENDFILE}
 .if defined(PROG_CXX)
 .if ${MK_CLANG_IS_CC} != "no" && empty(CXXFLAGS:M-stdlib=libstdc++)
-	echo ${PROG}: ${LIBCPLUSPLUS} >> ${DEPENDFILE}
+	echo ${PROG_FULL}: ${LIBCPLUSPLUS} >> ${DEPENDFILE}
 .else
-	echo ${PROG}: ${LIBSTDCPLUSPLUS} >> ${DEPENDFILE}
+	echo ${PROG_FULL}: ${LIBSTDCPLUSPLUS} >> ${DEPENDFILE}
 .endif
 .endif
 .endif
-- 
2.45.0