[src/netbsd-1-6]: src/sys/conf Pull up revision 1.23 (requested by sjg in tic...

[he <he%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/60e2de3eb976
branches:  netbsd-1-6
changeset: 529640:60e2de3eb976
user:      he <he%NetBSD.org@localhost>
date:      Sun Dec 01 22:26:32 2002 +0000

description:
Pull up revision 1.23 (requested by sjg in ticket #877):
  Replace COPTS?= with COPTS+=, so that setting COPTS in
  /etc/mk.conf (common on sparc systems) does not cause the
  -O2 in DEFCOPTS to be lost, resulting an an unloadable
  kernel on sparc.

diffstat:

 sys/conf/Makefile.kern.inc |  4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diffs (18 lines):

diff -r 067adac17427 -r 60e2de3eb976 sys/conf/Makefile.kern.inc
--- a/sys/conf/Makefile.kern.inc        Sun Dec 01 22:18:03 2002 +0000
+++ b/sys/conf/Makefile.kern.inc        Sun Dec 01 22:26:32 2002 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.kern.inc,v 1.13.4.7 2002/11/30 13:05:35 he Exp $
+#      $NetBSD: Makefile.kern.inc,v 1.13.4.8 2002/12/01 22:26:32 he Exp $
 #
 # This file contains common `MI' targets and definitions and it is included
 # at the bottom of each `MD' ${MACHINE}/conf/Makefile.${MACHINE}. There are
@@ -47,7 +47,7 @@
 INCLUDES?=     -I. ${EXTRA_INCLUDES} -I$S/arch -I$S -nostdinc
 CPPFLAGS+=     ${INCLUDES} ${IDENT} ${PARAM} -D_KERNEL -D_KERNEL_OPT
 DEFCOPTS?=     -O2
-COPTS?=                ${DEFCOPTS}
+COPTS+=                ${DEFCOPTS}
 DBG=           # might contain unwanted -Ofoo
 DEFWARNINGS?=  yes
 .if (${DEFWARNINGS} == "yes")