Date: Wed, 4 Jun 2025 20:59:07 GMT From: Mark Johnston <markj@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: 1776ba8de549 - main - share/mk: Define a rule for dtrace -G to generate .pieo files Message-ID: <202506042059.554Kx7Kk069468@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=1776ba8de54957316a5afe43076904506e43310c commit 1776ba8de54957316a5afe43076904506e43310c Author: Mark Johnston <markj@FreeBSD.org> AuthorDate: 2025-06-04 20:52:37 +0000 Commit: Mark Johnston <markj@FreeBSD.org> CommitDate: 2025-06-04 20:58:38 +0000 share/mk: Define a rule for dtrace -G to generate .pieo files Now that bsd.prog.mk uses .pieo instead of .o for object files linked into PIEs, we need to ensure that the object file generated by dtrace -G has the same extension. Fixes: 245bb0110639 ("Use .pieo extension for WITH_PIE bsd.prog.mk output") Sponsored by: Innovate UK --- share/mk/bsd.dep.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/share/mk/bsd.dep.mk b/share/mk/bsd.dep.mk index 4f182eff78b8..bcf92e90c5db 100644 --- a/share/mk/bsd.dep.mk +++ b/share/mk/bsd.dep.mk @@ -168,14 +168,14 @@ CLEANFILES+= ${_D}.h ${_D}.o ${_D}.o: ${_DSRC} ${OBJS:S/^${_D}.o$//} @rm -f ${.TARGET} ${DTRACE} ${DTRACEFLAGS} -G -o ${.TARGET} -s ${.ALLSRC:N*.h} +${_D}.pieo: ${_DSRC} ${OBJS:S/^${_D}.pieo$//} + @rm -f ${.TARGET} + ${DTRACE} ${DTRACEFLAGS} -G -o ${.TARGET} -s ${.ALLSRC:N*.h} .if defined(LIB) CLEANFILES+= ${_D}.pico ${_D}.pieo ${_D}.po ${_D}.nossppico ${_D}.pico: ${_DSRC} ${SOBJS:S/^${_D}.pico$//} @rm -f ${.TARGET} ${DTRACE} ${DTRACEFLAGS} -G -o ${.TARGET} -s ${.ALLSRC:N*.h} -${_D}.pieo: ${_DSRC} ${OBJS:S/^${_D}.pieo$//} - @rm -f ${.TARGET} - ${DTRACE} ${DTRACEFLAGS} -G -o ${.TARGET} -s ${.ALLSRC:N*.h} ${_D}.po: ${_DSRC} ${POBJS:S/^${_D}.po$//} @rm -f ${.TARGET} ${DTRACE} ${DTRACEFLAGS} -G -o ${.TARGET} -s ${.ALLSRC:N*.h}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202506042059.554Kx7Kk069468>