diff options
| author | imp <imp@FreeBSD.org> | 2001-01-22 08:07:58 +0000 |
|---|---|---|
| committer | imp <imp@FreeBSD.org> | 2001-01-22 08:07:58 +0000 |
| commit | eef8c6f7b952f39a9746defa02905ac1265c064a (patch) | |
| tree | 1c4c8cd5292128c7e593e541492360c2f9553dfd /Makefile.inc1 | |
| parent | bba4ebbdfd7a5e9ce1811cd20f1cc9c5f310b40b (diff) | |
| download | FreeBSD-src-eef8c6f7b952f39a9746defa02905ac1265c064a.zip FreeBSD-src-eef8c6f7b952f39a9746defa02905ac1265c064a.tar.gz | |
As threatened in hackers@ on Friday, obviate the need for a buildworld
to preceed a buildkernel.
The buildworld is still required when upgrading across major releases,
across binutil upgrades and when config changes version. If
buildkernel breaks, and you haven't done a buildworld, then do not
complain unless you do a buildworld and it still breaks.
Diffstat (limited to 'Makefile.inc1')
| -rw-r--r-- | Makefile.inc1 | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index 494eb28..ff9ef12 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -129,6 +129,7 @@ WORLDTMP= ${OBJTREE}${.CURDIR}/${BUILD_ARCH} # /usr/games added for fortune which depend on strfile STRICTTMPPATH= ${WORLDTMP}/usr/sbin:${WORLDTMP}/usr/bin:${WORLDTMP}/usr/games TMPPATH= ${STRICTTMPPATH}:${PATH} +OBJFORMAT_PATH?= /usr/libexec TMPDIR?= /tmp TMPPID!= echo $$$$ @@ -200,6 +201,10 @@ IMAKEENV= ${CROSSENV} \ PATH=${STRICTTMPPATH}:${INSTALLTMP} IMAKE= ${IMAKEENV} ${MAKE} -f Makefile.inc1 +# kernel stage +KMAKEENV= ${WMAKEENV} \ + OBJFORMAT_PATH=${WORLDTMP}/usr/libexec:${OBJFORMAT_PATH} + USRDIRS= usr/bin usr/lib/compat/aout usr/games usr/libdata/ldscripts \ usr/libexec/${OBJFORMAT} usr/sbin usr/share/misc @@ -408,10 +413,10 @@ buildkernel: ${MAKE} -f ${KRNLSRCDIR}/dev/aic7xxx/aicasm/Makefile .if !defined(NO_KERNELDEPEND) cd ${KRNLOBJDIR}/${_kernel}; \ - ${WMAKEENV} MACHINE=${MACHINE} ${MAKE} KERNEL=${INSTKERNNAME} depend + ${KMAKEENV} MACHINE=${MACHINE} ${MAKE} KERNEL=${INSTKERNNAME} depend .endif cd ${KRNLOBJDIR}/${_kernel}; \ - ${WMAKEENV} MACHINE=${MACHINE} ${MAKE} KERNEL=${INSTKERNNAME} all + ${KMAKEENV} MACHINE=${MACHINE} ${MAKE} KERNEL=${INSTKERNNAME} all @echo "--------------------------------------------------------------" @echo ">>> Kernel build for ${_kernel} completed on `LC_TIME=C date`" @echo "--------------------------------------------------------------" |
