Date: Fri, 10 Sep 2010 17:44:12 +0000 (UTC) From: Rui Paulo <rpaulo@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r212428 - head/share/mk Message-ID: <201009101744.o8AHiCGD071742@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rpaulo Date: Fri Sep 10 17:44:11 2010 New Revision: 212428 URL: http://svn.freebsd.org/changeset/base/212428 Log: 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 Modified: head/share/mk/bsd.dtrace.mk Modified: head/share/mk/bsd.dtrace.mk ============================================================================== --- head/share/mk/bsd.dtrace.mk Fri Sep 10 17:26:41 2010 (r212427) +++ head/share/mk/bsd.dtrace.mk Fri Sep 10 17:44:11 2010 (r212428) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201009101744.o8AHiCGD071742>