aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIan Lepore <ian@FreeBSD.org>2016-03-15 04:03:15 +0000
committerIan Lepore <ian@FreeBSD.org>2016-03-15 04:03:15 +0000
commit2ea2edffe11e4bfcfb5023bc3f298736c3376c37 (patch)
tree5a85ae343ccba33c1d7f795cacda1c0caebf301a
parent08ff8965e72f966e9facdaa8095008d77fa33507 (diff)
downloadsrc-2ea2edffe11e4bfcfb5023bc3f298736c3376c37.tar.gz
src-2ea2edffe11e4bfcfb5023bc3f298736c3376c37.zip
When building on a newer host, boostrap using lex from the stable-8 source
to match the yacc being used from that source. This avoids a build error caused by the newer lex emitting a yylex() decl that's already in the source. This is a direct commit to stable-8; there is no corresponding change in later branches to MFC from. For the record, the new lex came in at version 1000032, but slipping it into the 1000013 block makes more sense than creating a whole new .if block for it.
Notes
Notes: svn path=/stable/8/; revision=296888
-rw-r--r--Makefile.inc11
1 files changed, 1 insertions, 0 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1
index 023d9a045a53..cce0b4ea4406 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -953,6 +953,7 @@ _lex= usr.bin/lex
.endif
.if ${BOOTSTRAPPING} >= 1000013
+_lex= usr.bin/lex
_yacc= lib/liby \
usr.bin/yacc
.endif