1
0
mirror of https://git.FreeBSD.org/src.git synced 2024-12-30 12:04:07 +00:00

Fix ${TMAKE} to use the correct .mk files.

Removed stray -DNO_WERROR's.
This commit is contained in:
Ruslan Ermilov 2002-07-12 15:15:35 +00:00
parent 8f463ff4c5
commit 74064f9fac
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=99876

View File

@ -241,7 +241,8 @@ MAKEREADMES= make readmes PORTSDIR=${CHROOTDIR}/usr/ports
MAKEREADMES= true MAKEREADMES= true
.endif .endif
TMAKE!= cd ${.CURDIR}/..; ${MAKE} -f Makefile.inc1 -V TMAKE TMAKE!= echo MAKEFLAGS=\"-m ${.CURDIR}/../share/mk\"; \
cd ${.CURDIR}/..; ${MAKE} -f Makefile.inc1 -V TMAKE
WMAKEENV!= echo MAKEFLAGS=\"-m ${.CURDIR}/../share/mk\"; \ WMAKEENV!= echo MAKEFLAGS=\"-m ${.CURDIR}/../share/mk\"; \
cd ${.CURDIR}/..; ${CROSSMAKE} -f Makefile.inc1 -V WMAKEENV cd ${.CURDIR}/..; ${CROSSMAKE} -f Makefile.inc1 -V WMAKEENV
WMAKE= ${WMAKEENV} ${MAKE} WMAKE= ${WMAKEENV} ${MAKE}
@ -466,13 +467,13 @@ release.3:
release.4: release.4:
.for kernel in ${KERNELS} .for kernel in ${KERNELS}
cd ${.CURDIR}/..; \ cd ${.CURDIR}/..; \
${CROSSMAKE} ${KERNEL_FLAGS} -DNO_WERROR -DNO_MODULES \ ${CROSSMAKE} ${KERNEL_FLAGS} -DNO_MODULES \
KERNCONF=${kernel} INSTKERNNAME=${kernel} kernel \ KERNCONF=${kernel} INSTKERNNAME=${kernel} kernel \
DESTDIR=${RD}/trees/base DESTDIR=${RD}/trees/base
.endfor .endfor
# Install a standard boot kernel+modules. # Install a standard boot kernel+modules.
cd ${.CURDIR}/..; \ cd ${.CURDIR}/..; \
${CROSSMAKE} ${KERNEL_FLAGS} -DNO_WERROR \ ${CROSSMAKE} ${KERNEL_FLAGS} \
kernel \ kernel \
DESTDIR=${RD}/trees/base; \ DESTDIR=${RD}/trees/base; \
cd ${.CURDIR}/..; \ cd ${.CURDIR}/..; \
@ -937,7 +938,7 @@ doMFSKERN:
.endif .endif
cd ${.CURDIR}/..; \ cd ${.CURDIR}/..; \
KERNEL_KO=BOOTMFS KODIR= \ KERNEL_KO=BOOTMFS KODIR= \
${CROSSMAKE} ${KERNEL_FLAGS} -DNO_WERROR -DNO_MODULES -DNO_KERNELCLEAN \ ${CROSSMAKE} ${KERNEL_FLAGS} -DNO_MODULES -DNO_KERNELCLEAN \
KERNCONF=BOOTMFS buildkernel reinstallkernel \ KERNCONF=BOOTMFS buildkernel reinstallkernel \
DESTDIR=${RD}/kernels DESTDIR=${RD}/kernels
[ -r ${.CURDIR}/../sys/${TARGET}/conf/BOOTMFS.hints ] && \ [ -r ${.CURDIR}/../sys/${TARGET}/conf/BOOTMFS.hints ] && \