diff options
| author | bdrewery <bdrewery@FreeBSD.org> | 2015-12-02 00:49:49 +0000 |
|---|---|---|
| committer | bdrewery <bdrewery@FreeBSD.org> | 2015-12-02 00:49:49 +0000 |
| commit | 975d29fe5768828bad1af03d20f4e9f56086be9f (patch) | |
| tree | 3a1a32334af32f6cbdb5b8f88d3dbf90d66ef14e | |
| parent | ba39dbdfa20e0d61af41cf86f86bc9298075903f (diff) | |
| download | FreeBSD-src-975d29fe5768828bad1af03d20f4e9f56086be9f.zip FreeBSD-src-975d29fe5768828bad1af03d20f4e9f56086be9f.tar.gz | |
Reduce overlinking of libdtrace consumers with libctf, libelf, libproc.
The proper place for this list is _DP_dtrace.
Due to removing the LDADD_dtrace, more LIBADD are needed in
cddl/usr.sbin/dtrace to prevent underlinking.
This fixes overlinking in cddl/usr.sbin/lockstat and
cddl/usr.sbin/plockstat.
Sponsored by: EMC / Isilon Storage Division
| -rw-r--r-- | cddl/usr.sbin/dtrace/Makefile | 2 | ||||
| -rw-r--r-- | share/mk/src.libnames.mk | 5 |
2 files changed, 2 insertions, 5 deletions
diff --git a/cddl/usr.sbin/dtrace/Makefile b/cddl/usr.sbin/dtrace/Makefile index 551f6cf..ec41c60 100644 --- a/cddl/usr.sbin/dtrace/Makefile +++ b/cddl/usr.sbin/dtrace/Makefile @@ -22,7 +22,7 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris \ #CFLAGS+= -DNEED_ERRLOC #YFLAGS+= -d -LIBADD= dtrace +LIBADD= dtrace ctf elf proc .if ${MK_DTRACE_TESTS} != "no" SUBDIR+= tests diff --git a/share/mk/src.libnames.mk b/share/mk/src.libnames.mk index 5b5af52..d27f24f 100644 --- a/share/mk/src.libnames.mk +++ b/share/mk/src.libnames.mk @@ -240,7 +240,7 @@ _DP_ucl= m _DP_vmmapi= util _DP_ctf= z _DP_proc= rtld_db util -_DP_dtrace= rtld_db pthread +_DP_dtrace= ctf elf proc pthread rtld_db _DP_xo= util # Define spacial cases @@ -284,9 +284,6 @@ LDADD_fifolog+= ${LDADD_z} DPADD_ipf+= ${DPADD_kvm} LDADD_ipf+= ${LDADD_kvm} -DPADD_dtrace+= ${DPADD_ctf} ${DPADD_elf} ${DPADD_proc} -LDADD_dtrace+= ${LDADD_ctf} ${LDADD_elf} ${LDADD_proc} - # The following depends on libraries which are using pthread DPADD_hdb+= ${DPADD_pthread} LDADD_hdb+= ${LDADD_pthread} |
