From 5c6b79f70c1c799278732852206eda3a2c6e462c Mon Sep 17 00:00:00 2001
From: imp <imp@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Date: Wed, 12 Aug 2015 16:53:37 +0000
Subject: [PATCH] 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.


git-svn-id: svn://svn.freebsd.org/base/stable/10@286673 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
---
 Makefile.inc1 | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/Makefile.inc1 b/Makefile.inc1
index 7280ad8f9..e00cc9285 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -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
 
-- 
2.45.0