From owner-svn-src-stable@freebsd.org  Tue Mar 15 04:03:16 2016
Return-Path: <owner-svn-src-stable@freebsd.org>
Delivered-To: svn-src-stable@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 93F1CAD0309;
 Tue, 15 Mar 2016 04:03:16 +0000 (UTC) (envelope-from ian@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 6148BFB;
 Tue, 15 Mar 2016 04:03:16 +0000 (UTC) (envelope-from ian@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u2F43FFq060776;
 Tue, 15 Mar 2016 04:03:15 GMT (envelope-from ian@FreeBSD.org)
Received: (from ian@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u2F43FSl060775;
 Tue, 15 Mar 2016 04:03:15 GMT (envelope-from ian@FreeBSD.org)
Message-Id: <201603150403.u2F43FSl060775@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ian set sender to ian@FreeBSD.org
 using -f
From: Ian Lepore <ian@FreeBSD.org>
Date: Tue, 15 Mar 2016 04:03:15 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
Subject: svn commit: r296888 - stable/8
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable>, 
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 15 Mar 2016 04:03:16 -0000

Author: ian
Date: Tue Mar 15 04:03:15 2016
New Revision: 296888
URL: https://svnweb.freebsd.org/changeset/base/296888

Log:
  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.

Modified:
  stable/8/Makefile.inc1

Modified: stable/8/Makefile.inc1
==============================================================================
--- stable/8/Makefile.inc1	Tue Mar 15 03:20:24 2016	(r296887)
+++ stable/8/Makefile.inc1	Tue Mar 15 04:03:15 2016	(r296888)
@@ -953,6 +953,7 @@ _lex=		usr.bin/lex
 .endif
 
 .if ${BOOTSTRAPPING} >= 1000013
+_lex=		usr.bin/lex
 _yacc=		lib/liby \
 		usr.bin/yacc
 .endif