From 8dc7b23a026ddffb4103e5281eaa28571e22ad9c Mon Sep 17 00:00:00 2001 From: Bryan Drewery Date: Fri, 8 Jan 2016 21:07:34 +0000 Subject: [PATCH] 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 --- Makefile.inc1 | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index f56fc71ddcf5..a85f2e355c96 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -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/libnetbsd _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