svn commit: r187260 - head/sys/conf

[Craig Rodrigues]

Author: rodrigc
Date: Thu Jan 15 02:41:26 2009
New Revision: 187260
URL: http://svn.freebsd.org/changeset/base/187260

Log:
  When building up the command-line for the DTrace ctfmerge and ctfconvert
  utilities, add the ${DEBUG} variable from the kernel config.  Otherwise,
  if we build a kernel with WITH_CTF=1 set, ctfmerge will not have
  the -g flag set.  In this case, the cc has -g specified, so the
  .o files will have debug information generated, but since ctfmerge
  does not have -g set, it will strip out the ELF sections containing
  the DWARF debugging info, leading to a kernel without debugging symbols.
  
  Reviewed by:	jb

Modified:
  head/sys/conf/kern.pre.mk

Modified: head/sys/conf/kern.pre.mk
==============================================================================
--- head/sys/conf/kern.pre.mk	Thu Jan 15 02:35:40 2009	(r187259)
+++ head/sys/conf/kern.pre.mk	Thu Jan 15 02:41:26 2009	(r187260)
@@ -129,7 +129,7 @@ NORMAL_M= ${AWK} -f $S/tools/makeobjops.
 	  ${CC} -c ${CFLAGS} ${WERROR} ${PROF} ${.PREFIX}.c
 
 .if defined(CTFCONVERT)
-NORMAL_CTFCONVERT= ${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
+NORMAL_CTFCONVERT= ${CTFCONVERT} ${DEBUG} ${CTFFLAGS} ${.TARGET}
 .else
 NORMAL_CTFCONVERT=
 .endif
@@ -143,7 +143,7 @@ SYSTEM_OBJS= locore.o ${MDOBJS} ${OBJS}
 SYSTEM_OBJS+= ${SYSTEM_CFILES:.c=.o}
 SYSTEM_OBJS+= hack.So
 .if defined(CTFMERGE)
-SYSTEM_CTFMERGE= ${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${SYSTEM_OBJS} vers.o
+SYSTEM_CTFMERGE= ${CTFMERGE} ${DEBUG} ${CTFFLAGS} -o ${.TARGET} ${SYSTEM_OBJS} vers.o
 LD+= -g
 .endif
 SYSTEM_LD= @${LD} -Bdynamic -T ${LDSCRIPT} \