From owner-svn-src-head@FreeBSD.ORG  Fri Jan 27 18:29:04 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 4F5E8106564A;
	Fri, 27 Jan 2012 18:29:04 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 3974C8FC0A;
	Fri, 27 Jan 2012 18:29:04 +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 q0RIT4EW051547;
	Fri, 27 Jan 2012 18:29:04 GMT (envelope-from dim@svn.freebsd.org)
Received: (from dim@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q0RIT4Xq051545;
	Fri, 27 Jan 2012 18:29:04 GMT (envelope-from dim@svn.freebsd.org)
Message-Id: <201201271829.q0RIT4Xq051545@svn.freebsd.org>
From: Dimitry Andric <dim@FreeBSD.org>
Date: Fri, 27 Jan 2012 18:29:04 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r230622 - head
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 27 Jan 2012 18:29:04 -0000

Author: dim
Date: Fri Jan 27 18:29:03 2012
New Revision: 230622
URL: http://svn.freebsd.org/changeset/base/230622

Log:
  When the buildkernel stage 2.3 (build tools) runs, the PATH is still set
  to the default from the top-level Makefile.  Therefore, invocations of
  lex and yacc (used during building of aicasm) will use the executables
  in /usr/bin, not those optionally built during the previous buildworld
  or kernel-toolchain.  This makes kernel builds from older FreeBSD
  releases more difficult than necessary.
  
  Fix this by setting PATH to ${BPATH}:${PATH} in stage 2.3, so the
  bootstrap tools directories are searched before the regular ones.
  
  Silence from:	svn-src-{all,head}
  MFC after:	1 week

Modified:
  head/Makefile.inc1

Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1	Fri Jan 27 18:21:40 2012	(r230621)
+++ head/Makefile.inc1	Fri Jan 27 18:29:03 2012	(r230622)
@@ -832,6 +832,7 @@ buildkernel:
 	@echo ">>> stage 2.3: build tools"
 	@echo "--------------------------------------------------------------"
 	cd ${KRNLOBJDIR}/${_kernel}; \
+	    PATH=${BPATH}:${PATH} \
 	    MAKESRCPATH=${KERNSRCDIR}/dev/aic7xxx/aicasm \
 	    ${MAKE} SSP_CFLAGS= -DNO_CPU_CFLAGS -DNO_CTF \
 	    -f ${KERNSRCDIR}/dev/aic7xxx/aicasm/Makefile
@@ -839,6 +840,7 @@ buildkernel:
 .if !defined(MODULES_WITH_WORLD) && !defined(NO_MODULES) && exists(${KERNSRCDIR}/modules)
 .for target in obj depend all
 	cd ${KERNSRCDIR}/modules/aic7xxx/aicasm; \
+	    PATH=${BPATH}:${PATH} \
 	    MAKEOBJDIRPREFIX=${KRNLOBJDIR}/${_kernel}/modules \
 	    ${MAKE} SSP_CFLAGS= -DNO_CPU_CFLAGS -DNO_CTF ${target}
 .endfor