d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix upgrading from OSVERSION 1000002-1000032 after r288829.

Browse Source 
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 <slw@zxy.spb.ru>
This commit is contained in:
Bryan Drewery 2016-01-08 21:07:34 +00:00
parent 2bab0c5535
commit 8dc7b23a02
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Makefile.inc1
View File

@ -1425,11 +1425,13 @@ _vtfontcvt= usr.bin/vtfontcvt
_sed= usr.bin/sed _sed= usr.bin/sed
.endif .endif
.if ${BOOTSTRAPPING} < 1000002 .if ${BOOTSTRAPPING} < 1000033
_libopenbsd= lib/libopenbsd _libopenbsd= lib/libopenbsd
_m4= usr.bin/m4 _m4= usr.bin/m4
_lex= usr.bin/lex
${_bt}-usr.bin/m4: ${_bt}-lib/libopenbsd ${_bt}-usr.bin/m4: ${_bt}-lib/libopenbsd
${_bt}-usr.bin/lex: ${_bt}-usr.bin/m4
.endif .endif
.if ${BOOTSTRAPPING} < 1000026 .if ${BOOTSTRAPPING} < 1000026
@ -1443,12 +1445,6 @@ ${_bt}-usr.sbin/nmtree: ${_bt}-lib/libnetbsd
_cat= bin/cat _cat= bin/cat
.endif .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 # r277259 crunchide: Correct 64-bit section header offset
# r281674 crunchide: always include both 32- and 64-bit ELF support # r281674 crunchide: always include both 32- and 64-bit ELF support
# r285986 crunchen: use STRIPBIN rather than STRIP # r285986 crunchen: use STRIPBIN rather than STRIP