From bf4083607e8a2ef6fcfa9ca5e1287fd5fe3c5e16 Mon Sep 17 00:00:00 2001
From: Miod Vallat <miod@cvs.openbsd.org>
Date: Wed, 20 Aug 2003 19:37:00 +0000
Subject: No need to build installboot and the bootblocks at -O0 anymore.

---
 sys/arch/mvme88k/stand/bootsd/Makefile      | 4 ++--
 sys/arch/mvme88k/stand/bootst/Makefile      | 4 ++--
 sys/arch/mvme88k/stand/bootxx/Makefile      | 4 ++--
 sys/arch/mvme88k/stand/installboot/Makefile | 3 +--
 4 files changed, 7 insertions(+), 8 deletions(-)

(limited to 'sys')

diff --git a/sys/arch/mvme88k/stand/bootsd/Makefile b/sys/arch/mvme88k/stand/bootsd/Makefile
index 32a38df5c5a..b28de920560 100644
--- a/sys/arch/mvme88k/stand/bootsd/Makefile
+++ b/sys/arch/mvme88k/stand/bootsd/Makefile
@@ -1,12 +1,12 @@
 #	from: @(#)Makefile	8.1 (Berkeley) 6/10/93
-#	$OpenBSD: Makefile,v 1.8 2003/08/01 07:42:31 miod Exp $
+#	$OpenBSD: Makefile,v 1.9 2003/08/20 19:36:57 miod Exp $
 
       
 S=	${.CURDIR}/../../../..
 DEFS= 
 INCPATH=-I${.CURDIR} -I${.CURDIR}/../libsa -I${.CURDIR}/../libbug \
 	-I${.CURDIR}/../../include -I${S} -I${S}/lib/libsa
-CFLAGS=-O0 ${INCPATH} ${DEFS} ${COPTS}
+CFLAGS+=${INCPATH} ${DEFS} ${COPTS}
 LDFLAGS=-N -T ${STAGE2_RELOC}
 CLEANFILES+=bootsd
 
diff --git a/sys/arch/mvme88k/stand/bootst/Makefile b/sys/arch/mvme88k/stand/bootst/Makefile
index f9aa1c064a5..638a1073743 100644
--- a/sys/arch/mvme88k/stand/bootst/Makefile
+++ b/sys/arch/mvme88k/stand/bootst/Makefile
@@ -1,5 +1,5 @@
 #	from: @(#)Makefile	8.1 (Berkeley) 6/10/93
-#	$OpenBSD: Makefile,v 1.8 2003/08/01 07:42:32 miod Exp $
+#	$OpenBSD: Makefile,v 1.9 2003/08/20 19:36:59 miod Exp $
 
 SIZE?=	size
 
@@ -7,7 +7,7 @@ S=	${.CURDIR}/../../../..
 DEFS= -DSTANDALONE -DCOMPAT_NOLABEL
 INCPATH=-I${.CURDIR} -I${.CURDIR}/../libsa -I${.CURDIR}/../libbug \
 	-I${.CURDIR}/../../include -I${S} -I${S}/lib/libsa
-CFLAGS=-O0 ${INCPATH} ${DEFS} ${COPTS}
+CFLAGS+=${INCPATH} ${DEFS} ${COPTS}
 LDFLAGS=-s -N -T ${STAGE2_RELOC}
 CLEANFILES+=stboot bootst bootst.bug
 
diff --git a/sys/arch/mvme88k/stand/bootxx/Makefile b/sys/arch/mvme88k/stand/bootxx/Makefile
index 28530e986b6..0393d9a7e00 100644
--- a/sys/arch/mvme88k/stand/bootxx/Makefile
+++ b/sys/arch/mvme88k/stand/bootxx/Makefile
@@ -1,11 +1,11 @@
 #	from: @(#)Makefile	8.1 (Berkeley) 6/10/93
-#	$OpenBSD: Makefile,v 1.7 2003/08/01 07:42:33 miod Exp $
+#	$OpenBSD: Makefile,v 1.8 2003/08/20 19:36:59 miod Exp $
 
 S=	${.CURDIR}/../../../..
 DEFS=-DSTAGE2_RELOC=${STAGE2_RELOC} 
 INCPATH=-I${.CURDIR} -I${.CURDIR}/../libsa -I${.CURDIR}/../libbug \
 	-I${.CURDIR}/../../include -I${S} -I${S}/lib/libsa
-CFLAGS=-O0 ${INCPATH} ${DEFS} ${COPTS}
+CFLAGS+=${INCPATH} ${DEFS} ${COPTS}
 CLEANFILES+=bootxx
 
 .include "${S}/arch/mvme88k/stand/bugcrt/Makefile.inc"
diff --git a/sys/arch/mvme88k/stand/installboot/Makefile b/sys/arch/mvme88k/stand/installboot/Makefile
index 7f8502fec91..277af107c61 100644
--- a/sys/arch/mvme88k/stand/installboot/Makefile
+++ b/sys/arch/mvme88k/stand/installboot/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.6 2003/08/09 13:27:45 miod Exp $
+#	$OpenBSD: Makefile,v 1.7 2003/08/20 19:36:59 miod Exp $
 
 MAN=	installboot.8
 MANSUBDIR=mvme88k
@@ -8,7 +8,6 @@ PROG=	installboot
 BINDIR=/usr/mdec
 DPADD=${LIBUTIL}
 LDADD=-lutil
-CFLAGS+=-O0
 # Need this to work in the miniroot
 LDSTATIC=-static
 .else
-- 
cgit v1.2.3