From 48aea4da66366d16a506da0708ae029e9190615b Mon Sep 17 00:00:00 2001
From: Ruslan Ermilov <ru@FreeBSD.org>
Date: Fri, 13 Aug 2004 14:30:26 +0000
Subject: Removed COPTS support from kmod.mk and kern.pre.mk. COPTS support in
 bsd.prog.mk is preserved but discouraged.

---
 sys/conf/Makefile.powerpc | 2 +-
 sys/conf/kern.pre.mk      | 4 ++--
 sys/conf/kmod.mk          | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'sys/conf')

diff --git a/sys/conf/Makefile.powerpc b/sys/conf/Makefile.powerpc
index 7736a79b08fa..471ae7f92765 100644
--- a/sys/conf/Makefile.powerpc
+++ b/sys/conf/Makefile.powerpc
@@ -33,7 +33,7 @@ S=	../../..
 .endif
 .include "$S/conf/kern.pre.mk"
 
-COPTS+= -msoft-float
+CFLAGS+= -msoft-float
 
 %BEFORE_DEPEND
 
diff --git a/sys/conf/kern.pre.mk b/sys/conf/kern.pre.mk
index 98d1c736c671..e1a088bb223b 100644
--- a/sys/conf/kern.pre.mk
+++ b/sys/conf/kern.pre.mk
@@ -66,8 +66,8 @@ INCLUDES+= -I$S/contrib/dev/ath -I$S/contrib/dev/ath/freebsd
 # ... and the same for the NgATM stuff
 INCLUDES+= -I$S/contrib/ngatm
 
-COPTS=	${INCLUDES} -D_KERNEL -include opt_global.h
-CFLAGS=	${COPTFLAGS} ${CWARNFLAGS} ${DEBUG} ${COPTS}
+CFLAGS=	${COPTFLAGS} ${CWARNFLAGS} ${DEBUG}
+CFLAGS+= ${INCLUDES} -D_KERNEL -include opt_global.h
 .if ${CC} != "icc"
 CFLAGS+= -fno-common -finline-limit=${INLINE_LIMIT}
 CFLAGS+= --param inline-unit-growth=100
diff --git a/sys/conf/kmod.mk b/sys/conf/kmod.mk
index 6ac4035e33fa..17a4e6576a01 100644
--- a/sys/conf/kmod.mk
+++ b/sys/conf/kmod.mk
@@ -73,7 +73,7 @@ OBJCOPY?=	objcopy
 .if ${CC} == "icc"
 CFLAGS:=	${CFLAGS:C/(-x[^M^K^W]+)[MKW]+|-x[MKW]+/\1/}
 .endif
-CFLAGS+=	${COPTS} -D_KERNEL
+CFLAGS+=	-D_KERNEL
 CFLAGS+=	-DKLD_MODULE
 
 # Don't use any standard or source-relative include directories.
-- 
cgit v1.2.3