svn commit: r283108 - head

[Ed Maste]

Author: emaste
Date: Tue May 19 14:05:15 2015
New Revision: 283108
URL: https://svnweb.freebsd.org/changeset/base/283108

Log:
  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

Modified:
  head/Makefile.inc1

Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1	Tue May 19 14:04:21 2015	(r283107)
+++ head/Makefile.inc1	Tue May 19 14:05:15 2015	(r283108)
@@ -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/*} == ""