d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update crunch bootstrapping test for recent fixes

Browse Source 
- 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
This commit is contained in:
Ed Maste 2015-05-19 14:05:15 +00:00
parent 3dd01a884c
commit 7f36f2d0e4
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Makefile.inc1
View File

@ -1297,7 +1297,9 @@ _cat= bin/cat
_lex= usr.bin/lex _lex= usr.bin/lex
.endif .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 _crunch= usr.sbin/crunch
.endif .endif
@ -1466,11 +1468,6 @@ kernel-tools: .MAKE
_btxld= usr.sbin/btxld _btxld= usr.sbin/btxld
.endif .endif
.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 we're given an XAS, don't build binutils.
.if ${XAS:M/*} == "" .if ${XAS:M/*} == ""