svn commit: r230971 - stable/9

[Dimitry Andric]

Author: dim
Date: Fri Feb  3 23:36:08 2012
New Revision: 230971
URL: http://svn.freebsd.org/changeset/base/230971

Log:
  MFC r230622:
  
  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}

Modified:
  stable/9/Makefile.inc1   (contents, props changed)

Modified: stable/9/Makefile.inc1
==============================================================================
--- stable/9/Makefile.inc1	Fri Feb  3 23:35:39 2012	(r230970)
+++ stable/9/Makefile.inc1	Fri Feb  3 23:36:08 2012	(r230971)
@@ -830,6 +830,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
@@ -837,6 +838,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