d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix a few small bugs in the DTrace USDT rules:

Browse Source 
* anchor search strings appropriately,
* use .ALLSRC to pass the full path to the D script to dtrace(1),
* don't insert the auto-generated header into SRCS - it doesn't
  accomplish anything, and we end up having to remove it from OBJS anyway.

Reviewed by:		rpaulo
Differential Revision:	https://reviews.freebsd.org/D978
MFC after:		3 weeks
Sponsored by:		EMC / Isilon Storage Division
This commit is contained in:
Mark Johnston 2014-10-21 04:30:00 +00:00
parent 9302455e9a
commit e9083b2dc5
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
share/mk/bsd.dep.mk
View File

@ -132,20 +132,17 @@ CFLAGS+= -I${.OBJDIR}
DHDRS+= ${_D}.h
${_D}.h: ${_DSRC}
${DTRACE} -xnolibs -h -s ${.ALLSRC}
SRCS:= ${SRCS:S/${_DSRC}/${_D}.h/}
SRCS:= ${SRCS:S/^${_DSRC}$//}
OBJS+= ${_D}.o
CLEANFILES+= ${_D}.h ${_D}.o
${_D}.o: ${_D}.h ${OBJS:S/${_D}.o//}
${DTRACE} -xnolibs -G -o ${.TARGET} -s ${.CURDIR}/${_DSRC} \
${OBJS:S/${_D}.o//}
${_D}.o: ${_DSRC} ${OBJS:S/^${_D}.o$//}
${DTRACE} -xnolibs -G -o ${.TARGET} -s ${.ALLSRC}
.if defined(LIB)
CLEANFILES+= ${_D}.So ${_D}.po
${_D}.So: ${_D}.h ${SOBJS:S/${_D}.So//}
${DTRACE} -xnolibs -G -o ${.TARGET} -s ${.CURDIR}/${_DSRC} \
${SOBJS:S/${_D}.So//}
${_D}.po: ${_D}.h ${POBJS:S/${_D}.po//}
${DTRACE} -xnolibs -G -o ${.TARGET} -s ${.CURDIR}/${_DSRC} \
${POBJS:S/${_D}.po//}
${_D}.So: ${_DSRC} ${SOBJS:S/^${_D}.So$//}
${DTRACE} -xnolibs -G -o ${.TARGET} -s ${.ALLSRC}
${_D}.po: ${_DSRC} ${POBJS:S/^${_D}.po$//}
${DTRACE} -xnolibs -G -o ${.TARGET} -s ${.ALLSRC}
.endif
.endfor
.endfor