From owner-svn-src-all@freebsd.org  Mon Oct  5 17:45:14 2015
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@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 7E3E599A5FC;
 Mon,  5 Oct 2015 17:45:14 +0000 (UTC) (envelope-from ian@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2001:1900:2254:2068::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 6F9BCD8F;
 Mon,  5 Oct 2015 17:45:14 +0000 (UTC) (envelope-from ian@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.70])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t95HjE2u027723;
 Mon, 5 Oct 2015 17:45:14 GMT (envelope-from ian@FreeBSD.org)
Received: (from ian@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id t95HjE29027722;
 Mon, 5 Oct 2015 17:45:14 GMT (envelope-from ian@FreeBSD.org)
Message-Id: <201510051745.t95HjE29027722@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: Mon, 5 Oct 2015 17:45:14 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r288829 - head
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 05 Oct 2015 17:45:14 -0000

Author: ian
Date: Mon Oct  5 17:45:13 2015
New Revision: 288829
URL: https://svnweb.freebsd.org/changeset/base/288829

Log:
  The latest version of lex requires the latest m4 to build, add a dependency
  when running the build-tools stage.
  
  The requirement is due to the -P flag used when running m4 from usr.bin/lex
  Makefile to generate skel.c.  With the old m4 that fails and the failure is
  ignored, resulting in an empty(-ish) skel.c, which leads to later build
  failures when the misconfigured new lex tool is run.
  
  This enables building -current (and 10-stable after MFC) on a stable-8
  system again.
  
  MFC after:	3 days

Modified:
  head/Makefile.inc1

Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1	Mon Oct  5 17:21:17 2015	(r288828)
+++ head/Makefile.inc1	Mon Oct  5 17:45:13 2015	(r288829)
@@ -1322,6 +1322,8 @@ _cat=		bin/cat
 
 .if ${BOOTSTRAPPING} < 1000033
 _lex=		usr.bin/lex
+
+${_bt}-usr.bin/lex: ${_bt}-usr.bin/m4
 .endif
 
 # r277259 crunchide: Correct 64-bit section header offset