Mon Mar 10 02:36:50 2014 UTC ()
Do COMPILE_CTFCONVERT on vers.o as same as other targets

Otherwise, we will get the error when building a kernel with -V MKDTRACE:
  ERROR: nbctfmerge: Input file vers.o was partially built from C sources,
  but no CTF data was present


(ozaki-r)
diff -r1.166 -r1.167 src/sys/conf/Makefile.kern.inc
cvs diff -r1.166 -r1.167 src/sys/conf/Makefile.kern.inc (expand / switch to unified diff)

--- src/sys/conf/Makefile.kern.inc 2014/03/10 02:04:29 1.166
+++ src/sys/conf/Makefile.kern.inc 2014/03/10 02:36:50 1.167
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.kern.inc,v 1.166 2014/03/10 02:04:29 ozaki-r Exp $ 1# $NetBSD: Makefile.kern.inc,v 1.167 2014/03/10 02:36:50 ozaki-r Exp $
2# 2#
3# This file contains common `MI' targets and definitions and it is included 3# This file contains common `MI' targets and definitions and it is included
4# at the bottom of each `MD' ${MACHINE}/conf/Makefile.${MACHINE}. 4# at the bottom of each `MD' ${MACHINE}/conf/Makefile.${MACHINE}.
5# 5#
6# Each target in this file should be protected with `if !target(target)' 6# Each target in this file should be protected with `if !target(target)'
7# or `if !commands(target)' and each variable should only be conditionally 7# or `if !commands(target)' and each variable should only be conditionally
8# assigned `VAR ?= VALUE', so that everything can be overriden. 8# assigned `VAR ?= VALUE', so that everything can be overriden.
9# 9#
10# DEBUG is set to -g if debugging. 10# DEBUG is set to -g if debugging.
11# PROF is set to -pg if profiling. 11# PROF is set to -pg if profiling.
12# 12#
13# To specify debugging, add the config line: makeoptions DEBUG="-g" 13# To specify debugging, add the config line: makeoptions DEBUG="-g"
14# A better way is to specify -g only for a few files. 14# A better way is to specify -g only for a few files.
@@ -345,26 +345,27 @@ MKREPRO?=no @@ -345,26 +345,27 @@ MKREPRO?=no
345_NVFLAGS=${NVFLAGS} -r 345_NVFLAGS=${NVFLAGS} -r
346.else 346.else
347_NVFLAGS=${NVFLAGS} 347_NVFLAGS=${NVFLAGS}
348.endif 348.endif
349 349
350.if !target(vers.o) 350.if !target(vers.o)
351newvers: vers.o 351newvers: vers.o
352vers.o: ${SYSTEM_DEP} ${SYSTEM_SWAP_DEP} $S/conf/newvers.sh \ 352vers.o: ${SYSTEM_DEP} ${SYSTEM_SWAP_DEP} $S/conf/newvers.sh \
353 $S/conf/osrelease.sh ${_NETBSD_VERSION_DEPENDS} 353 $S/conf/osrelease.sh ${_NETBSD_VERSION_DEPENDS}
354 ${_MKMSG_CREATE} vers.c 354 ${_MKMSG_CREATE} vers.c
355 ${HOST_SH} $S/conf/newvers.sh ${_NVFLAGS} 355 ${HOST_SH} $S/conf/newvers.sh ${_NVFLAGS}
356 ${_MKTARGET_COMPILE} 356 ${_MKTARGET_COMPILE}
357 ${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c vers.c 357 ${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c vers.c
 358 ${COMPILE_CTFCONVERT}
358.endif 359.endif
359 360
360.if defined(MEMORY_DISK_IMAGE) 361.if defined(MEMORY_DISK_IMAGE)
361md_root_image.h: ${MEMORY_DISK_IMAGE} 362md_root_image.h: ${MEMORY_DISK_IMAGE}
362 ${_MKTARGET_CREATE} 363 ${_MKTARGET_CREATE}
363 ${TOOL_HEXDUMP} -v -e '"\t" 8/1 "0x%02x, " "\n"' ${.ALLSRC} > ${.TARGET} 364 ${TOOL_HEXDUMP} -v -e '"\t" 8/1 "0x%02x, " "\n"' ${.ALLSRC} > ${.TARGET}
364 365
365# XXX This is only needed when building md_root.o 366# XXX This is only needed when building md_root.o
366CPPFLAGS+= -DMEMORY_DISK_IMAGE 367CPPFLAGS+= -DMEMORY_DISK_IMAGE
367md_root.o: md_root_image.h 368md_root.o: md_root_image.h
368.endif 369.endif
369 370
370# depend on MEMORY_DISK_IMAGE configuration 371# depend on MEMORY_DISK_IMAGE configuration