From 7f36f2d0e42aec4fe05db024a35ff9eea81d3cbb Mon Sep 17 00:00:00 2001
From: Ed Maste <emaste@FreeBSD.org>
Date: Tue, 19 May 2015 14:05:15 +0000
Subject: [PATCH] Update crunch bootstrapping test for recent fixes

- r277259 crunchide: Correct 64-bit section header offset
- r281674 crunchide: always include both 32- and 64-bit ELF support

With built-in cross-size support we also no longer need a special case
for cross-build crunchide.

Reviewed by:	imp
Sponsored by:	The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D2576
---
 Makefile.inc1 | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/Makefile.inc1 b/Makefile.inc1
index 3a19fb57481c..55b15c2d3329 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -1297,7 +1297,9 @@ _cat=		bin/cat
 _lex=		usr.bin/lex
 .endif
 
-.if ${BOOTSTRAPPING} < 1001507
+# r277259 crunchide: Correct 64-bit section header offset
+# r281674 crunchide: always include both 32- and 64-bit ELF support
+.if ${BOOTSTRAPPING} < 1100071
 _crunch=	usr.sbin/crunch
 .endif
 
@@ -1466,11 +1468,6 @@ kernel-tools: .MAKE
 _btxld=		usr.sbin/btxld
 .endif
 .endif
-.if ${TARGET_ARCH} != ${MACHINE_ARCH}
-.if ${MK_RESCUE} != "no"
-_crunchide=	usr.sbin/crunch/crunchide
-.endif
-.endif
 
 # If we're given an XAS, don't build binutils.
 .if ${XAS:M/*} == ""