Re: kernel dtrace and current

On Mon, Sep 14, 2015 at 4:16 PM, Mark Johnston <markj_at_freebsd.org> wrote:

> On Mon, Sep 14, 2015 at 11:54:27AM -0400, Ryan Stone wrote:
> > On Mon, Sep 14, 2015 at 6:08 AM, Alexander V. Chernikov <
> > melifaro_at_freebsd.org> wrote:
> >
> > > (So I suppose that for some reason I got old ctfmerge)
> > >
> >
> > I believe that ctfmerge is only built as a bootstrap tool when the host
> > system's FreeBSD version is obsolete.  Mark, you probably should update
> > Makefile.inc1.
>
> Right, thanks. I'll commit the change below in a bit; it'll force
> ctfmerge to be rebuilt until the next __FreeBSD_version bump (the last
> one occurred 10 days before the ctfmerge fix went in). Bumping the
> version just for this seems like overkill, given that it's a simple bug
> fix that doesn't introduce any incompatibilities.
>
> diff --git a/Makefile.inc1 b/Makefile.inc1
> index 397c1af..a2058dc 100644
> --- a/Makefile.inc1
> +++ b/Makefile.inc1
> _at__at_ -1358,7 +1358,7 _at__at_ ${_bt}-usr.bin/clang/tblgen:
> ${_bt}-lib/clang/libllvmtablegen ${_bt}-lib/clang/l
>  # ELF Tool Chain libraries are needed for ELF tools and dtrace tools.
>  # dtrace tools are required for older bootstrap env and cross-build
>  # pre libdwarf
> -.if ${BOOTSTRAPPING} < 1100006 || (${MACHINE} != ${TARGET} || \
> +.if ${BOOTSTRAPPING} < 1100080 || (${MACHINE} != ${TARGET} || \
>      ${MACHINE_ARCH} != ${TARGET_ARCH})
>  .if ${MK_CDDL} != "no"
>  _dtrace_tools= cddl/usr.bin/sgsmsg cddl/lib/libctf
> cddl/usr.bin/ctfconvert \
>

Looks good to me.

However, maybe we should remove the if entirely. We have enough velocity
in ctfmerge that it would just be flat safer to do that. We don't need to
hyper
optimize our build time at the expense of safety when people tweak things.

Warner