Date: Wed, 12 Aug 2015 16:53:37 +0000 (UTC) From: Warner Losh <imp@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r286673 - stable/10 Message-ID: <201508121653.t7CGrbYt029373@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: imp Date: Wed Aug 12 16:53:37 2015 New Revision: 286673 URL: https://svnweb.freebsd.org/changeset/base/286673 Log: 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. Modified: stable/10/Makefile.inc1 Modified: stable/10/Makefile.inc1 ============================================================================== --- stable/10/Makefile.inc1 Wed Aug 12 16:43:15 2015 (r286672) +++ stable/10/Makefile.inc1 Wed Aug 12 16:53:37 2015 (r286673) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201508121653.t7CGrbYt029373>