Date: Thu, 13 Jun 2013 14:42:43 -0500 From: Brooks Davis <brooks@FreeBSD.org> To: Dimitry Andric <dim@FreeBSD.org> Cc: svn-src-head@FreeBSD.org, svn-src-all@FreeBSD.org, Brooks Davis <brooks@FreeBSD.org>, src-committers@FreeBSD.org Subject: Re: svn commit: r251689 - head Message-ID: <20130613194243.GA2199@lor.one-eyed-alien.net> In-Reply-To: <8B4F57F5-07E3-4D41-8F58-78F605D64D7E@FreeBSD.org> References: <201306131826.r5DIQ440060741@svn.freebsd.org> <8B4F57F5-07E3-4D41-8F58-78F605D64D7E@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
[-- Attachment #1 --] On Thu, Jun 13, 2013 at 08:53:14PM +0200, Dimitry Andric wrote: > On Jun 13, 2013, at 20:26, Brooks Davis <brooks@FreeBSD.org> wrote: > > Author: brooks > > Date: Thu Jun 13 18:26:04 2013 > > New Revision: 251689 > > URL: http://svnweb.freebsd.org/changeset/base/251689 > > > > Log: > > Be more agressive about bootstrapping ctfmerge and ctfconvert so > > builds from existing releases have a chance of working properly. > > > > Sponsored by: DARPA, AFRL > > MFC after: 3 days > > > > Modified: > > head/Makefile.inc1 > > > > Modified: head/Makefile.inc1 > > ============================================================================== > > --- head/Makefile.inc1 Thu Jun 13 17:13:15 2013 (r251688) > > +++ head/Makefile.inc1 Thu Jun 13 18:26:04 2013 (r251689) > > @@ -1203,8 +1203,8 @@ _clang_tblgen= \ > > > > # dtrace tools are required for older bootstrap env and cross-build > > .if ${MK_CDDL} != "no" && \ > > - ((${BOOTSTRAPPING} < 800038 && \ > > - !(${BOOTSTRAPPING} >= 700112 && ${BOOTSTRAPPING} < 799999)) \ > > + ((${BOOTSTRAPPING} < 1000034 && \ > > + !(${BOOTSTRAPPING} >= 901505 && ${BOOTSTRAPPING} < 999999)) \ > > || (${MACHINE} != ${TARGET} || ${MACHINE_ARCH} != ${TARGET_ARCH})) > > _dtrace_tools= cddl/usr.bin/sgsmsg cddl/lib/libctf lib/libelf \ > > lib/libdwarf cddl/usr.bin/ctfconvert cddl/usr.bin/ctfmerge > > > Does this fix that kernel builds seem to use /usr/bin/ctfmerge (e.g. > when building on stable/8 or stable/9)? I believe it does. -- Brooks [-- Attachment #2 --] -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (FreeBSD) iD8DBQFRuiCzXY6L6fI4GtQRArqSAKCPFt7YaLu0C94swXSiHrg1hZtj5QCfcedV IfYHpiUYJVd5y2Co0Jr8PWU= =0rx8 -----END PGP SIGNATURE-----
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20130613194243.GA2199>