From 51ccb83a3923175922a8abde93fb985e719f71e2 Mon Sep 17 00:00:00 2001 From: Rui Paulo Date: Fri, 10 Sep 2010 17:44:11 +0000 Subject: [PATCH] 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 --- share/mk/bsd.dtrace.mk | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/share/mk/bsd.dtrace.mk b/share/mk/bsd.dtrace.mk index bc4d90679903..bebe969ccf10 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} -.if defined(PROG) -_DTRACELINKING:=${OBJS} -OBJS+=${DTRACEOBJS} -.else -_DTRACELINKING:=${SOBJS} -SOBJS+=${DTRACEOBJS} -.endif + DPADD+=${LIBELF} LDADD+=-lelf +.if defined(PROG) +_DTRACELINKING=${OBJS} +OBJS+=${DTRACEOBJS} +.else +_DTRACELINKING=${SOBJS} +SOBJS+=${DTRACEOBJS} +.endif + +${DTRACEOBJS}: + beforedepend: ${DTRACE} -C -h -s ${DTRACESRCS} beforelinking: - ${DTRACE} -G -s ${DTRACESRCS} ${_DTRACELINKING} + ${DTRACE} -G -s ${DTRACESRCS} ${_DTRACELINKING:S/${DTRACEOBJS}//} .endif