svn commit: r278682 - head/share/mk

[John Baldwin]

Author: jhb
Date: Fri Feb 13 17:33:27 2015
New Revision: 278682
URL: https://svnweb.freebsd.org/changeset/base/278682

Log:
  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.
  
  Differential Revision:	https://reviews.freebsd.org/D1834
  Reviewed by:	emaste
  MFC after:	3 days

Modified:
  head/share/mk/bsd.lib.mk
  head/share/mk/bsd.prog.mk

Modified: head/share/mk/bsd.lib.mk
==============================================================================
--- head/share/mk/bsd.lib.mk	Fri Feb 13 16:35:12 2015	(r278681)
+++ head/share/mk/bsd.lib.mk	Fri Feb 13 17:33:27 2015	(r278682)
@@ -286,7 +286,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
 

Modified: head/share/mk/bsd.prog.mk
==============================================================================
--- head/share/mk/bsd.prog.mk	Fri Feb 13 16:35:12 2015	(r278681)
+++ head/share/mk/bsd.prog.mk	Fri Feb 13 17:33:27 2015	(r278682)
@@ -168,15 +168,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 ${COMPILER_TYPE} == "clang" && 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