svn commit: r362549 - head/sys/conf

[Conrad Meyer]

Author: cem
Date: Tue Jun 23 18:25:31 2020
New Revision: 362549
URL: https://svnweb.freebsd.org/changeset/base/362549

Log:
  kmod.mk: Don't split out debug symbols if requested
  
  Ports bsd.kmod.mk explicitly sets MK_KERNEL_SYMBOLS=no to prevent auto-
  splitting of debuginfo from kernel modules.  If that knob is set, don't
  split out a .ko.debug and .ko from .ko.full; just generate a .ko with
  debuginfo and leave it be.
  
  Otherwise, with DEBUG_FLAGS set and MK_KERNEL_SYMBOLS=no, we would helpfully
  strip out the debuginfo from the .ko.full and then not install it.  That is
  not the desired result a WITH_DEBUG port kmod build.
  
  Reviewed by:	emaste, jhb
  Differential Revision:	https://reviews.freebsd.org/D24835

Modified:
  head/sys/conf/kmod.mk

Modified: head/sys/conf/kmod.mk
==============================================================================
--- head/sys/conf/kmod.mk	Tue Jun 23 18:24:15 2020	(r362548)
+++ head/sys/conf/kmod.mk	Tue Jun 23 18:25:31 2020	(r362549)
@@ -215,7 +215,7 @@ OBJS+=	${SRCS:N*.h:R:S/$/.o/g}
 PROG=	${KMOD}.ko
 .endif
 
-.if !defined(DEBUG_FLAGS)
+.if !defined(DEBUG_FLAGS) || ${MK_KERNEL_SYMBOLS} == "no"
 FULLPROG=	${PROG}
 .else
 FULLPROG=	${PROG}.full
@@ -319,7 +319,7 @@ ${_ILINKS}:
 
 CLEANFILES+= ${PROG} ${KMOD}.kld ${OBJS}
 
-.if defined(DEBUG_FLAGS)
+.if defined(DEBUG_FLAGS) && ${MK_KERNEL_SYMBOLS} != "no"
 CLEANFILES+= ${FULLPROG} ${PROG}.debug
 .endif