diff options
| author | jhb <jhb@FreeBSD.org> | 2015-03-13 17:45:34 +0000 |
|---|---|---|
| committer | jhb <jhb@FreeBSD.org> | 2015-03-13 17:45:34 +0000 |
| commit | 60a7481f466b258425c75974173b3a86921659ff (patch) | |
| tree | 3fe7d0dc5bf3498aa5321b591e934d1769780579 | |
| parent | 7c0c64012edfc7006a0b177575a2b88123c41662 (diff) | |
| download | FreeBSD-src-60a7481f466b258425c75974173b3a86921659ff.zip FreeBSD-src-60a7481f466b258425c75974173b3a86921659ff.tar.gz | |
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.
| -rw-r--r-- | share/mk/bsd.lib.mk | 2 | ||||
| -rw-r--r-- | 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 95d465a..3ea0da8 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 6c2effb..ab51784 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 |
