diff options
| author | imp <imp@FreeBSD.org> | 2015-08-12 16:53:37 +0000 |
|---|---|---|
| committer | imp <imp@FreeBSD.org> | 2015-08-12 16:53:37 +0000 |
| commit | 979769b37b1c0d3e6a9240a24fb07124bd925482 (patch) | |
| tree | 89b35a9bc13f1c97c8578f26344650bc60449a23 /Makefile.inc1 | |
| parent | 9ba02646927077ca37f89360abd6b1eb2db1903d (diff) | |
| download | FreeBSD-src-979769b37b1c0d3e6a9240a24fb07124bd925482.zip FreeBSD-src-979769b37b1c0d3e6a9240a24fb07124bd925482.tar.gz | |
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.
Diffstat (limited to 'Makefile.inc1')
| -rw-r--r-- | Makefile.inc1 | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index 7280ad8..e00cc92 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 |
