From owner-svn-src-head@FreeBSD.ORG  Thu Jun 13 18:53:15 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 5CCB32C2;
 Thu, 13 Jun 2013 18:53:15 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from tensor.andric.com (tensor.andric.com
 [IPv6:2001:7b8:3a7:1:2d0:b7ff:fea0:8c26])
 by mx1.freebsd.org (Postfix) with ESMTP id 2798D1DE8;
 Thu, 13 Jun 2013 18:53:15 +0000 (UTC)
Received: from [IPv6:2001:7b8:3a7::a1cf:34fa:e697:eadc] (unknown
 [IPv6:2001:7b8:3a7:0:a1cf:34fa:e697:eadc])
 (using TLSv1 with cipher AES128-SHA (128/128 bits))
 (No client certificate requested)
 by tensor.andric.com (Postfix) with ESMTPSA id 0E3775C44;
 Thu, 13 Jun 2013 20:53:13 +0200 (CEST)
Content-Type: text/plain; charset=us-ascii
Mime-Version: 1.0 (Mac OS X Mail 6.5 \(1508\))
Subject: Re: svn commit: r251689 - head
From: Dimitry Andric <dim@FreeBSD.org>
In-Reply-To: <201306131826.r5DIQ440060741@svn.freebsd.org>
Date: Thu, 13 Jun 2013 20:53:14 +0200
Content-Transfer-Encoding: quoted-printable
Message-Id: <8B4F57F5-07E3-4D41-8F58-78F605D64D7E@FreeBSD.org>
References: <201306131826.r5DIQ440060741@svn.freebsd.org>
To: Brooks Davis <brooks@FreeBSD.org>
X-Mailer: Apple Mail (2.1508)
Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org,
 src-committers@freebsd.org
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 13 Jun 2013 18:53:15 -0000

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
>=20
> Log:
>  Be more agressive about bootstrapping ctfmerge and ctfconvert so
>  builds from existing releases have a chance of working properly.
>=20
>  Sponsored by:	DARPA, AFRL
>  MFC after:	3 days
>=20
> Modified:
>  head/Makefile.inc1
>=20
> Modified: head/Makefile.inc1
> =
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
> --- 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=3D \
>=20
> # dtrace tools are required for older bootstrap env and cross-build
> .if ${MK_CDDL} !=3D "no" && \
> -    ((${BOOTSTRAPPING} < 800038 && \
> -          !(${BOOTSTRAPPING} >=3D 700112 && ${BOOTSTRAPPING} < =
799999)) \
> +    ((${BOOTSTRAPPING} < 1000034 && \
> +          !(${BOOTSTRAPPING} >=3D 901505 && ${BOOTSTRAPPING} < =
999999)) \
>       || (${MACHINE} !=3D ${TARGET} || ${MACHINE_ARCH} !=3D =
${TARGET_ARCH}))
> _dtrace_tools=3D 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)?