From 9b26c7b87b6a10edf98cb84cb8dd83c03ccbd148 Mon Sep 17 00:00:00 2001
From: deraadt <deraadt@openbsd.org>
Date: Sun, 14 Apr 2019 14:07:05 +0000
Subject: Instead of using COPTS=-Oz (and similar) in make environment to force
 tightly-built ramdisk kernels, set the option in per-arch Makefile.inc based
 upon SMALL_KERNEL

---
 distrib/sparc64/bsd.rd/Makefile   | 4 ++--
 distrib/sparc64/ramdisk/Makefile  | 4 ++--
 distrib/sparc64/ramdiskB/Makefile | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'distrib/sparc64')

diff --git a/distrib/sparc64/bsd.rd/Makefile b/distrib/sparc64/bsd.rd/Makefile
index 15b60a0ad2c..bbd338bc0da 100644
--- a/distrib/sparc64/bsd.rd/Makefile
+++ b/distrib/sparc64/bsd.rd/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.36 2019/04/05 21:08:01 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.37 2019/04/14 14:07:08 deraadt Exp $
 
 TOP=		${.CURDIR}/..
 
@@ -30,7 +30,7 @@ bsd.rd_unz: bsd ${IMAGE}
 
 bsd:
 	cd ${.CURDIR}/../../../sys/arch/sparc64/compile/${RAMDISK} && \
-	    su ${BUILDUSER} -c '${MAKE} config && ${MAKE} clean && env COPTS=-Oz ${MAKE}'
+	    su ${BUILDUSER} -c '${MAKE} config && ${MAKE} clean && ${MAKE}'
 	cp -p ${.CURDIR}/../../../sys/arch/sparc64/compile/${RAMDISK}/obj/bsd bsd
 
 ${IMAGE}: ${CBIN}
diff --git a/distrib/sparc64/ramdisk/Makefile b/distrib/sparc64/ramdisk/Makefile
index 9acd15ce1d6..054f3cdc882 100644
--- a/distrib/sparc64/ramdisk/Makefile
+++ b/distrib/sparc64/ramdisk/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.37 2019/04/05 21:08:01 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.38 2019/04/14 14:07:08 deraadt Exp $
 
 TOP=		${.CURDIR}/..
 
@@ -77,7 +77,7 @@ ${IMAGE}: ${CBIN}
 
 bsd:
 	cd ${TOP}/../../sys/arch/sparc64/compile/${KERNEL} && \
-	    su ${BUILDUSER} -c '${MAKE} config && ${MAKE} clean && env COPTS=-Oz ${MAKE}'
+	    su ${BUILDUSER} -c '${MAKE} config && ${MAKE} clean && env ${MAKE}'
 	cp -p ${TOP}/../../sys/arch/sparc64/compile/${KERNEL}/obj/bsd bsd
 
 unconfig:
diff --git a/distrib/sparc64/ramdiskB/Makefile b/distrib/sparc64/ramdiskB/Makefile
index 940f5a1801e..b6efc0a0a6a 100644
--- a/distrib/sparc64/ramdiskB/Makefile
+++ b/distrib/sparc64/ramdiskB/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.31 2019/04/05 21:08:01 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.32 2019/04/14 14:07:08 deraadt Exp $
 
 TOP=		${.CURDIR}/..
 
@@ -77,7 +77,7 @@ ${IMAGE}: ${CBIN}
 
 bsd:
 	cd ${TOP}/../../sys/arch/sparc64/compile/${KERNEL} && \
-	    su ${BUILDUSER} -c '${MAKE} config && ${MAKE} clean && env COPTS=-Oz ${MAKE}'
+	    su ${BUILDUSER} -c '${MAKE} config && ${MAKE} clean && ${MAKE}'
 	cp -p ${TOP}/../../sys/arch/sparc64/compile/${KERNEL}/obj/bsd bsd
 
 unconfig:
-- 
cgit v1.2.3-59-g8ed1b