summaryrefslogtreecommitdiffstats
path: root/sys/boot
diff options
context:
space:
mode:
authorru <ru@FreeBSD.org>2008-06-26 07:56:16 +0000
committerru <ru@FreeBSD.org>2008-06-26 07:56:16 +0000
commitb8643de2d0b7a329c677c0e2821b57791c7d4ae7 (patch)
tree58d7efae800500e4d86b56aed0f725540cc3f0ac /sys/boot
parentc878414354902f7800675ee0bf31d10892400a81 (diff)
downloadFreeBSD-src-b8643de2d0b7a329c677c0e2821b57791c7d4ae7.zip
FreeBSD-src-b8643de2d0b7a329c677c0e2821b57791c7d4ae7.tar.gz
Fix a fallout from SSP commit, and make this compile again.
Bonus: including kern.mk just to pick kernel warning flags was an extremely bad idea anyway, because it also picked up CFLAGS (it probably wasn't the case at the time of CVS rev. 1.1, I haven't checked). Remove duplicate CWARNFLAGS from CFLAGS.
Diffstat (limited to 'sys/boot')
-rw-r--r--sys/boot/pc98/boot2/Makefile3
1 files changed, 1 insertions, 2 deletions
diff --git a/sys/boot/pc98/boot2/Makefile b/sys/boot/pc98/boot2/Makefile
index 2bac1e4..f5da55d 100644
--- a/sys/boot/pc98/boot2/Makefile
+++ b/sys/boot/pc98/boot2/Makefile
@@ -12,7 +12,6 @@ CFLAGS= -Os -mrtd \
-fno-unit-at-a-time \
-D_KERNEL -DBOOTWAIT=${BOOTWAIT} -DTIMEOUT=${TIMEOUT}
CFLAGS+= -DBOOTSEG=${BOOTSEG} -DBOOTSTACK=${BOOTSTACK}
-CFLAGS+= ${CWARNFLAGS}
CFLAGS+= -I${.CURDIR}/../../.. -I.
# By default, if a serial port is going to be used as console, use COM1
@@ -110,5 +109,5 @@ i386:
CLEANFILES+= machine i386
-.include "${.CURDIR}/../../../conf/kern.mk"
+CWARNFLAGS!= ${MAKE} -f bsd.own.mk -f ${.CURDIR}/../../../conf/kern.mk -V CWARNFLAGS
.include <bsd.prog.mk>
OpenPOWER on IntegriCloud