From owner-svn-src-stable@FreeBSD.ORG  Sat May 26 23:42:53 2012
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 0717B106566B;
	Sat, 26 May 2012 23:42:53 +0000 (UTC) (envelope-from des@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id E51CD8FC08;
	Sat, 26 May 2012 23:42:52 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q4QNgqvc013650;
	Sat, 26 May 2012 23:42:52 GMT (envelope-from des@svn.freebsd.org)
Received: (from des@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q4QNgqAg013648;
	Sat, 26 May 2012 23:42:52 GMT (envelope-from des@svn.freebsd.org)
Message-Id: <201205262342.q4QNgqAg013648@svn.freebsd.org>
From: Dag-Erling Smorgrav <des@FreeBSD.org>
Date: Sat, 26 May 2012 23:42:52 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r236128 - stable/9
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/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: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 26 May 2012 23:42:53 -0000

Author: des
Date: Sat May 26 23:42:52 2012
New Revision: 236128
URL: http://svn.freebsd.org/changeset/base/236128

Log:
  Make yacc a bootstrap tool if building on head, since the new yacc is
  not 100% backward compatible.  Also, build yacc before lex, because lex
  requires yacc but not vice versa.

Modified:
  stable/9/Makefile.inc1

Modified: stable/9/Makefile.inc1
==============================================================================
--- stable/9/Makefile.inc1	Sat May 26 23:10:36 2012	(r236127)
+++ stable/9/Makefile.inc1	Sat May 26 23:42:52 2012	(r236128)
@@ -1026,6 +1026,9 @@ _sed=		usr.bin/sed
 
 .if ${BOOTSTRAPPING} < 900006
 _lex=		usr.bin/lex
+.endif
+
+.if ${BOOTSTRAPPING} < 900006 || ${BOOTSTRAPPING} > 1000012
 _yacc=		usr.bin/yacc
 .endif
 
@@ -1080,8 +1083,8 @@ bootstrap-tools:
     ${_mklocale} \
     usr.bin/rpcgen \
     ${_sed} \
-    ${_lex} \
     ${_yacc} \
+    ${_lex} \
     usr.bin/xinstall \
     ${_gensnmptree} \
     usr.sbin/config \