Author: bdrewery Date: Fri Jan 8 21:07:34 2016 New Revision: 293440 URL: https://svnweb.freebsd.org/changeset/base/293440
Log: Fix upgrading from OSVERSION 1000002-1000032 after r288829. r288829 states that lex requires the latest m4, but was not always building it. Move lex to the same logic as m4 since they are closely tied now. MFC after: 3 days Sponsored by: EMC / Isilon Storage Division Reported by: Slawa Olhovchenkov <[email protected]> Modified: head/Makefile.inc1 Modified: head/Makefile.inc1 ============================================================================== --- head/Makefile.inc1 Fri Jan 8 20:34:57 2016 (r293439) +++ head/Makefile.inc1 Fri Jan 8 21:07:34 2016 (r293440) @@ -1425,11 +1425,13 @@ _vtfontcvt= usr.bin/vtfontcvt _sed= usr.bin/sed .endif -.if ${BOOTSTRAPPING} < 1000002 +.if ${BOOTSTRAPPING} < 1000033 _libopenbsd= lib/libopenbsd _m4= usr.bin/m4 +_lex= usr.bin/lex ${_bt}-usr.bin/m4: ${_bt}-lib/libopenbsd +${_bt}-usr.bin/lex: ${_bt}-usr.bin/m4 .endif .if ${BOOTSTRAPPING} < 1000026 @@ -1443,12 +1445,6 @@ ${_bt}-usr.sbin/nmtree: ${_bt}-lib/libne _cat= bin/cat .endif -.if ${BOOTSTRAPPING} < 1000033 -_lex= usr.bin/lex - -${_bt}-usr.bin/lex: ${_bt}-usr.bin/m4 -.endif - # r277259 crunchide: Correct 64-bit section header offset # r281674 crunchide: always include both 32- and 64-bit ELF support # r285986 crunchen: use STRIPBIN rather than STRIP _______________________________________________ [email protected] mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "[email protected]"
