summaryrefslogtreecommitdiffstats
path: root/share
diff options
context:
space:
mode:
authorrpaulo <rpaulo@FreeBSD.org>2010-09-10 17:44:11 +0000
committerrpaulo <rpaulo@FreeBSD.org>2010-09-10 17:44:11 +0000
commita2cf0528ac8857cf956620678a7a95d4aa80ba2b (patch)
tree573688ddfb862174b7aa1185b3d3f78ef4b04f9f /share
parenta55dbb294d2b256de033e61309be70abb54d4a50 (diff)
downloadFreeBSD-src-a2cf0528ac8857cf956620678a7a95d4aa80ba2b.zip
FreeBSD-src-a2cf0528ac8857cf956620678a7a95d4aa80ba2b.tar.gz
Fix bugs introduced in the previous rev:
* add a phatom target for the DTRACEOBJS * when invoking DTrace, don't add DTRACEOBJS to the command line. Sponsored by: The FreeBSD Foundation
Diffstat (limited to 'share')
-rw-r--r--share/mk/bsd.dtrace.mk14
1 files changed, 9 insertions, 5 deletions
diff --git a/share/mk/bsd.dtrace.mk b/share/mk/bsd.dtrace.mk
index bc4d906..bebe969 100644
--- a/share/mk/bsd.dtrace.mk
+++ b/share/mk/bsd.dtrace.mk
@@ -37,19 +37,23 @@ CFLAGS+=-DWITH_DTRACE
DTRACEHEADERS=${DTRACEOBJS:S/o$/h/}
DTRACESRCS=${DTRACEOBJS:S/o$/d/}
CLEANFILES+=${DTRACEOBJS} ${DTRACEHEADERS}
+
+DPADD+=${LIBELF}
+LDADD+=-lelf
+
.if defined(PROG)
-_DTRACELINKING:=${OBJS}
+_DTRACELINKING=${OBJS}
OBJS+=${DTRACEOBJS}
.else
-_DTRACELINKING:=${SOBJS}
+_DTRACELINKING=${SOBJS}
SOBJS+=${DTRACEOBJS}
.endif
-DPADD+=${LIBELF}
-LDADD+=-lelf
+
+${DTRACEOBJS}:
beforedepend:
${DTRACE} -C -h -s ${DTRACESRCS}
beforelinking:
- ${DTRACE} -G -s ${DTRACESRCS} ${_DTRACELINKING}
+ ${DTRACE} -G -s ${DTRACESRCS} ${_DTRACELINKING:S/${DTRACEOBJS}//}
.endif
OpenPOWER on IntegriCloud