diff options
| author | dim <dim@FreeBSD.org> | 2012-01-27 18:29:03 +0000 |
|---|---|---|
| committer | dim <dim@FreeBSD.org> | 2012-01-27 18:29:03 +0000 |
| commit | ee292f1f00c3658b64c10f59158dda32531a8afb (patch) | |
| tree | 98c291bc2f3d73d4997cb622e7c2b948fbddb233 /Makefile.inc1 | |
| parent | 7d5ab4d392e0d512c30a6860b8b5744bbbd86a57 (diff) | |
| download | FreeBSD-src-ee292f1f00c3658b64c10f59158dda32531a8afb.zip FreeBSD-src-ee292f1f00c3658b64c10f59158dda32531a8afb.tar.gz | |
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
Diffstat (limited to 'Makefile.inc1')
| -rw-r--r-- | Makefile.inc1 | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index 8dc4594..4f0aaba 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -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 |
