diff options
| author | jhb <jhb@FreeBSD.org> | 2015-02-13 17:33:27 +0000 |
|---|---|---|
| committer | jhb <jhb@FreeBSD.org> | 2015-02-13 17:33:27 +0000 |
| commit | fcac47744db3b9611eece768036345acc7c9ff05 (patch) | |
| tree | 4067f2dd25d4c60189a88943c7232364ee6f11a2 /share | |
| parent | ee4071c1c938a982d7ee306a64580f52173c3130 (diff) | |
| download | FreeBSD-src-fcac47744db3b9611eece768036345acc7c9ff05.zip FreeBSD-src-fcac47744db3b9611eece768036345acc7c9ff05.tar.gz | |
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
Diffstat (limited to 'share')
| -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 6a6f3f2..72a43ae 100644 --- a/share/mk/bsd.lib.mk +++ b/share/mk/bsd.lib.mk @@ -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 diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk index e4c0c4c..3fb70d1 100644 --- a/share/mk/bsd.prog.mk +++ b/share/mk/bsd.prog.mk @@ -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 |
