Sat Jun 13 11:28:24 2020 UTC ()
nbmake bootstrap: if MAKEVERBOSE < 2, output similar to <bsd.own.mk>


(lukem)
diff -r1.12 -r1.13 src/tools/make/buildmake.sh.in
cvs diff -r1.12 -r1.13 src/tools/make/buildmake.sh.in (expand / switch to unified diff)

--- src/tools/make/buildmake.sh.in 2018/01/16 08:53:51 1.12
+++ src/tools/make/buildmake.sh.in 2020/06/13 11:28:24 1.13
@@ -1,28 +1,33 @@ @@ -1,28 +1,33 @@
1#! /bin/sh 1#! /bin/sh
2# $NetBSD: buildmake.sh.in,v 1.12 2018/01/16 08:53:51 uwe Exp $ 2# $NetBSD: buildmake.sh.in,v 1.13 2020/06/13 11:28:24 lukem Exp $
3# 3#
4# buildmake.sh.in - Autoconf-processed shell script for building make(1). 4# buildmake.sh.in - Autoconf-processed shell script for building make(1).
5# 5#
6 6
7: ${NETBSDSRCDIR:=@srcdir@/../..} 7: ${NETBSDSRCDIR:=@srcdir@/../..}
8MKSRCDIR=${NETBSDSRCDIR}/usr.bin/make 8MKSRCDIR=${NETBSDSRCDIR}/usr.bin/make
9 9
10_CC="@CC@" 10_CC="@CC@"
11 11
12_CFLAGS="@CPPFLAGS@" 12_CFLAGS="@CPPFLAGS@"
13_CFLAGS="${_CFLAGS} -D_PATH_DEFSYSPATH=\"${NETBSDSRCDIR}/share/mk\"" 13_CFLAGS="${_CFLAGS} -D_PATH_DEFSYSPATH=\"${NETBSDSRCDIR}/share/mk\""
14_CFLAGS="${_CFLAGS} @DEFS@" 14_CFLAGS="${_CFLAGS} @DEFS@"
15_CFLAGS="${_CFLAGS} @CFLAGS@" 15_CFLAGS="${_CFLAGS} @CFLAGS@"
16 16
17_LDFLAGS="@LDFLAGS@ @LIBS@" 17_LDFLAGS="@LDFLAGS@ @LIBS@"
18 18
19docmd () { 19docmd () {
20 echo "$1" 20 if [ ${MAKEVERBOSE:-2} -lt 2 ]; then
21 $1 || exit 1 21 echo " $1 ${2##*/}"
 22 else
 23 echo "$3"
 24 fi
 25 $3 || exit 1
22} 26}
23 27
24for f in $MKSRCDIR/*.c $MKSRCDIR/lst.lib/*.c; do 28for f in $MKSRCDIR/*.c $MKSRCDIR/lst.lib/*.c; do
25 docmd "${_CC} ${_CFLAGS} -c $f" 29 docmd "compile " "$f" "${_CC} ${_CFLAGS} -c $f"
26done 30done
27 31
28docmd "${_CC} -o ${_TOOL_PREFIX:-nb}make *.o ${_LDFLAGS}" 32docmd " link " "${_TOOL_PREFIX:-nb}make" \
 33 "${_CC} -o ${_TOOL_PREFIX:-nb}make *.o ${_LDFLAGS}"