diff options
| author | emaste <emaste@FreeBSD.org> | 2015-05-19 14:05:15 +0000 |
|---|---|---|
| committer | emaste <emaste@FreeBSD.org> | 2015-05-19 14:05:15 +0000 |
| commit | d2cafe1802f18314fd0996775fe5accb88210a4f (patch) | |
| tree | 020616972cf89195549db99c39253b69ba9324f8 /Makefile.inc1 | |
| parent | abca06eaec7a6da01e5d9d7e7298073f1bea37ff (diff) | |
| download | FreeBSD-src-d2cafe1802f18314fd0996775fe5accb88210a4f.zip FreeBSD-src-d2cafe1802f18314fd0996775fe5accb88210a4f.tar.gz | |
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
Diffstat (limited to 'Makefile.inc1')
| -rw-r--r-- | Makefile.inc1 | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index 3a19fb5..55b15c2 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/*} == "" |
