Mon Apr 5 22:52:03 2021 UTC ()
Don't use /usr/bin/time (it is not portable)


(christos)
diff -r1.278 -r1.279 src/sys/conf/Makefile.kern.inc
cvs diff -r1.278 -r1.279 src/sys/conf/Makefile.kern.inc (expand / switch to unified diff)

--- src/sys/conf/Makefile.kern.inc 2021/04/05 06:22:00 1.278
+++ src/sys/conf/Makefile.kern.inc 2021/04/05 22:52:03 1.279
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.kern.inc,v 1.278 2021/04/05 06:22:00 simonb Exp $ 1# $NetBSD: Makefile.kern.inc,v 1.279 2021/04/05 22:52:03 christos 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.
@@ -252,27 +252,27 @@ SYSTEM_LD_TAIL+=${SYSTEM_LD_TAIL_DEBUG} @@ -252,27 +252,27 @@ SYSTEM_LD_TAIL+=${SYSTEM_LD_TAIL_DEBUG}
252LINKFLAGS+= ${LINKFLAGS_DEBUG} 252LINKFLAGS+= ${LINKFLAGS_DEBUG}
253EXTRA_KERNELS+= ${KERNELS:@.KERNEL.@${.KERNEL.}.gdb@} 253EXTRA_KERNELS+= ${KERNELS:@.KERNEL.@${.KERNEL.}.gdb@}
254CTFFLAGS+= -g 254CTFFLAGS+= -g
255TARGETSFX= .gdb 255TARGETSFX= .gdb
256.elifndef PROF 256.elifndef PROF
257LINKFLAGS+= ${LINKFLAGS_NORMAL} 257LINKFLAGS+= ${LINKFLAGS_NORMAL}
258.endif 258.endif
259 259
260SYSTEM_LD_HEAD+= ${SYSTEM_LD_HEAD_EXTRA} 260SYSTEM_LD_HEAD+= ${SYSTEM_LD_HEAD_EXTRA}
261SYSTEM_LD_TAIL_STAGE1= ${SYSTEM_LD_TAIL} 261SYSTEM_LD_TAIL_STAGE1= ${SYSTEM_LD_TAIL}
262SYSTEM_LD_TAIL_STAGE2= ${SYSTEM_LD_TAIL} 262SYSTEM_LD_TAIL_STAGE2= ${SYSTEM_LD_TAIL}
263.if defined(CTFMERGE) 263.if defined(CTFMERGE)
264SYSTEM_LD_TAIL_STAGE2+= && echo ${CTFMERGE} ${CTFMFLAGS} -o ${.TARGET} ... \ 264SYSTEM_LD_TAIL_STAGE2+= && echo ${CTFMERGE} ${CTFMFLAGS} -o ${.TARGET} ... \
265 && time -t ${CTFMERGE} ${CTFMFLAGS} -o ${.TARGET} \ 265 && ${CTFMERGE} ${CTFMFLAGS} -o ${.TARGET} \
266 ${SYSTEM_OBJ} ${EXTRA_OBJ} vers.o 266 ${SYSTEM_OBJ} ${EXTRA_OBJ} vers.o
267.endif 267.endif
268.if defined(COPY_SYMTAB) 268.if defined(COPY_SYMTAB)
269SYSTEM_LD_TAIL_STAGE2+= && echo ${DBSYM} $@ && ${DBSYM} $@ 269SYSTEM_LD_TAIL_STAGE2+= && echo ${DBSYM} $@ && ${DBSYM} $@
270.if !empty(DEBUG:M-g) 270.if !empty(DEBUG:M-g)
271SYSTEM_LD_TAIL_STAGE2+= && echo ${DBSYM} $@.gdb && ${DBSYM} $@.gdb 271SYSTEM_LD_TAIL_STAGE2+= && echo ${DBSYM} $@.gdb && ${DBSYM} $@.gdb
272.endif 272.endif
273.endif 273.endif
274SYSTEM_LD_TAIL_STAGE2+= ${SYSTEM_LD_TAIL_EXTRA} 274SYSTEM_LD_TAIL_STAGE2+= ${SYSTEM_LD_TAIL_EXTRA}
275 275
276## 276##
277## (6) port independent targets and dependencies: assym.h, vers.o 277## (6) port independent targets and dependencies: assym.h, vers.o
278## 278##