From owner-svn-src-all@freebsd.org  Wed Aug 12 16:53:38 2015
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 235429A0DD9;
 Wed, 12 Aug 2015 16:53:38 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 109F633B;
 Wed, 12 Aug 2015 16:53:38 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.70])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t7CGrbeP029374;
 Wed, 12 Aug 2015 16:53:37 GMT (envelope-from imp@FreeBSD.org)
Received: (from imp@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id t7CGrbYt029373;
 Wed, 12 Aug 2015 16:53:37 GMT (envelope-from imp@FreeBSD.org)
Message-Id: <201508121653.t7CGrbYt029373@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org
 using -f
From: Warner Losh <imp@FreeBSD.org>
Date: Wed, 12 Aug 2015 16:53:37 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r286673 - stable/10
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 12 Aug 2015 16:53:38 -0000

Author: imp
Date: Wed Aug 12 16:53:37 2015
New Revision: 286673
URL: https://svnweb.freebsd.org/changeset/base/286673

Log:
  Direct commit
  
  When compiling on -current from r284356 to r285986, the host's
  crunchgen can't be used because builds of rescue break when STRIP= was
  used to prevent stripping of binaries.  Direct commit because -current
  code is different. Building 10 on current is common enough to warrnat
  a safety belt since this has been broken for two months. The offending
  change was never in stable/10.

Modified:
  stable/10/Makefile.inc1

Modified: stable/10/Makefile.inc1
==============================================================================
--- stable/10/Makefile.inc1	Wed Aug 12 16:43:15 2015	(r286672)
+++ stable/10/Makefile.inc1	Wed Aug 12 16:53:37 2015	(r286673)
@@ -1262,7 +1262,11 @@ _yacc=		lib/liby \
 ${_bt}-usr.bin/yacc: ${_bt}-lib/liby
 .endif
 
-.if ${BOOTSTRAPPING} < 1000014
+# crunchgen broken on head with STRIP= for a while, even
+# when building stable binaries, so bootstrap there too.
+# r284356 to r285986 is the broken range.
+.if ${BOOTSTRAPPING} < 1000014 || \
+	(${BOOTSTRAPPING} > 1100076 && ${BOOTSTRAPPING} < 1100078)
 _crunch=	usr.sbin/crunch
 .endif