Module Name:    src
Committed By:   lukem
Date:           Sat Jun 13 11:28:24 UTC 2020

Modified Files:
        src/tools/make: buildmake.sh.in

Log Message:
nbmake bootstrap: if MAKEVERBOSE < 2, output similar to <bsd.own.mk>


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/tools/make/buildmake.sh.in

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/tools/make/buildmake.sh.in
diff -u src/tools/make/buildmake.sh.in:1.12 src/tools/make/buildmake.sh.in:1.13
--- src/tools/make/buildmake.sh.in:1.12	Tue Jan 16 08:53:51 2018
+++ src/tools/make/buildmake.sh.in	Sat Jun 13 11:28:24 2020
@@ -1,5 +1,5 @@
 #! /bin/sh
-#	$NetBSD: buildmake.sh.in,v 1.12 2018/01/16 08:53:51 uwe Exp $
+#	$NetBSD: buildmake.sh.in,v 1.13 2020/06/13 11:28:24 lukem Exp $
 #
 # buildmake.sh.in - Autoconf-processed shell script for building make(1).
 #
@@ -17,12 +17,17 @@ _CFLAGS="${_CFLAGS} @CFLAGS@"
 _LDFLAGS="@LDFLAGS@ @LIBS@"
 
 docmd () {
-	echo "$1"
-	$1 || exit 1
+	if [ ${MAKEVERBOSE:-2} -lt 2 ]; then
+		echo "   $1 ${2##*/}"
+	else
+		echo "$3"
+	fi
+	$3 || exit 1
 }
 
 for f in $MKSRCDIR/*.c $MKSRCDIR/lst.lib/*.c; do
-	docmd "${_CC} ${_CFLAGS} -c $f"
+	docmd "compile " "$f" "${_CC} ${_CFLAGS} -c $f"
 done
 
-docmd "${_CC} -o ${_TOOL_PREFIX:-nb}make *.o ${_LDFLAGS}"
+docmd "   link " "${_TOOL_PREFIX:-nb}make" \
+	"${_CC} -o ${_TOOL_PREFIX:-nb}make *.o ${_LDFLAGS}"

Reply via email to