svn commit: r279958 - in stable: 10/share/mk 9/share/mk

[John Baldwin]

Author: jhb
Date: Fri Mar 13 17:45:34 2015
New Revision: 279958
URL: https://svnweb.freebsd.org/changeset/base/279958

Log:
  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.

Modified:
  stable/9/share/mk/bsd.lib.mk
  stable/9/share/mk/bsd.prog.mk
Directory Properties:
  stable/9/share/mk/   (props changed)

Changes in other areas also in this revision:
Modified:
  stable/10/share/mk/bsd.lib.mk
  stable/10/share/mk/bsd.prog.mk
Directory Properties:
  stable/10/   (props changed)

Modified: stable/9/share/mk/bsd.lib.mk
==============================================================================
--- stable/9/share/mk/bsd.lib.mk	Fri Mar 13 16:43:52 2015	(r279957)
+++ stable/9/share/mk/bsd.lib.mk	Fri Mar 13 17:45:34 2015	(r279958)
@@ -275,7 +275,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: stable/9/share/mk/bsd.prog.mk
==============================================================================
--- stable/9/share/mk/bsd.prog.mk	Fri Mar 13 16:43:52 2015	(r279957)
+++ stable/9/share/mk/bsd.prog.mk	Fri Mar 13 17:45:34 2015	(r279958)
@@ -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) && !defined(EARLY_BUILD)
 .if !empty(CXXFLAGS:M-stdlib=libc++)
-	echo ${PROG}: ${LIBCPLUSPLUS} >> ${DEPENDFILE}
+	echo ${PROG_FULL}: ${LIBCPLUSPLUS} >> ${DEPENDFILE}
 .else
-	echo ${PROG}: ${LIBSTDCPLUSPLUS} >> ${DEPENDFILE}
+	echo ${PROG_FULL}: ${LIBSTDCPLUSPLUS} >> ${DEPENDFILE}
 .endif
 .endif
 .endif