CVS commit: src/tools/make
Module Name:src
Committed By: lukem
Date: Sat Jun 13 11:39:43 UTC 2020
Modified Files:
src/tools/make: buildmake.sh.in
Log Message:
nbmake bootstrap: be quieter if MAKEVERBOSE==0
More accurately simulate and don't even print
the "compile" lines with MAKEVERBOSE=0
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 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.14 src/tools/make/buildmake.sh.in:1.15
--- src/tools/make/buildmake.sh.in:1.14 Sat Jun 13 11:32:52 2020
+++ src/tools/make/buildmake.sh.in Sat Jun 13 11:39:43 2020
@@ -1,5 +1,5 @@
#! /bin/sh
-# $NetBSD: buildmake.sh.in,v 1.14 2020/06/13 11:32:52 lukem Exp $
+# $NetBSD: buildmake.sh.in,v 1.15 2020/06/13 11:39:43 lukem Exp $
#
# buildmake.sh.in - Autoconf-processed shell script for building make(1).
#
@@ -17,11 +17,14 @@ _CFLAGS="${_CFLAGS} @CFLAGS@"
_LDFLAGS="@LDFLAGS@ @LIBS@"
docmd () {
- if [ ${MAKEVERBOSE:-2} -lt 2 ]; then
- echo "$1 ${2##*/}"
- else
- echo "$3"
- fi
+ case "${MAKEVERBOSE:-2}" in
+ 0)
+ ;;
+ 1)
+ echo "$1 ${2##*/}" ;;
+ *)
+ echo "$3" ;;
+ esac
$3 || exit 1
}
CVS commit: src/tools/make
Module Name:src
Committed By: lukem
Date: Sat Jun 13 11:32:52 UTC 2020
Modified Files:
src/tools/make: buildmake.sh.in
Log Message:
nbmake bootstrap: consistency fix in MAKEVERBOSE<2 support
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 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.13 src/tools/make/buildmake.sh.in:1.14
--- src/tools/make/buildmake.sh.in:1.13 Sat Jun 13 11:28:24 2020
+++ src/tools/make/buildmake.sh.in Sat Jun 13 11:32:52 2020
@@ -1,5 +1,5 @@
#! /bin/sh
-# $NetBSD: buildmake.sh.in,v 1.13 2020/06/13 11:28:24 lukem Exp $
+# $NetBSD: buildmake.sh.in,v 1.14 2020/06/13 11:32:52 lukem Exp $
#
# buildmake.sh.in - Autoconf-processed shell script for building make(1).
#
@@ -18,7 +18,7 @@ _LDFLAGS="@LDFLAGS@ @LIBS@"
docmd () {
if [ ${MAKEVERBOSE:-2} -lt 2 ]; then
- echo " $1 ${2##*/}"
+ echo "$1 ${2##*/}"
else
echo "$3"
fi
CVS commit: src/tools/make
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
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}"
CVS commit: src/tools/make
Module Name:src
Committed By: uwe
Date: Tue Jan 16 08:53:51 UTC 2018
Modified Files:
src/tools/make: buildmake.sh.in
Log Message:
Do not use HOST_CFLAGS and others. build.sh calls configure with
CFLAGS set to HOST_CFLAGS, etc - so HOST_* environment variables are
already taken into account if set.
OTOH, if configure were to add anything to CFLAGS etc, the old code
would happily ignore those changes, picking up original environment
variables instead.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 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.11 src/tools/make/buildmake.sh.in:1.12
--- src/tools/make/buildmake.sh.in:1.11 Mon Jan 15 20:14:49 2018
+++ src/tools/make/buildmake.sh.in Tue Jan 16 08:53:51 2018
@@ -1,25 +1,28 @@
#! /bin/sh
-# $NetBSD: buildmake.sh.in,v 1.11 2018/01/15 20:14:49 uwe Exp $
+# $NetBSD: buildmake.sh.in,v 1.12 2018/01/16 08:53:51 uwe Exp $
#
# buildmake.sh.in - Autoconf-processed shell script for building make(1).
#
: ${NETBSDSRCDIR:=@srcdir@/../..}
+MKSRCDIR=${NETBSDSRCDIR}/usr.bin/make
+
+_CC="@CC@"
+
+_CFLAGS="@CPPFLAGS@"
+_CFLAGS="${_CFLAGS} -D_PATH_DEFSYSPATH=\"${NETBSDSRCDIR}/share/mk\""
+_CFLAGS="${_CFLAGS} @DEFS@"
+_CFLAGS="${_CFLAGS} @CFLAGS@"
-: ${HOST_CC="@CC@"}
-: ${HOST_CFLAGS="@CPPFLAGS@ @CFLAGS@"}
-: ${HOST_LDFLAGS="@LDFLAGS@ @LIBS@"}
+_LDFLAGS="@LDFLAGS@ @LIBS@"
docmd () {
echo "$1"
$1 || exit 1
}
-MKSRCDIR=${NETBSDSRCDIR}/usr.bin/make
-HOST_CFLAGS="${HOST_CFLAGS} -D_PATH_DEFSYSPATH=\"${NETBSDSRCDIR}/share/mk\""
-
for f in $MKSRCDIR/*.c $MKSRCDIR/lst.lib/*.c; do
- docmd "${HOST_CC} ${HOST_CFLAGS} @DEFS@ -c $f"
+ docmd "${_CC} ${_CFLAGS} -c $f"
done
-docmd "${HOST_CC} -o ${_TOOL_PREFIX:-nb}make *.o ${HOST_LDFLAGS}"
+docmd "${_CC} -o ${_TOOL_PREFIX:-nb}make *.o ${_LDFLAGS}"
CVS commit: src/tools/make
Module Name:src
Committed By: uwe
Date: Mon Jan 15 20:14:49 UTC 2018
Modified Files:
src/tools/make: buildmake.sh.in
Log Message:
Do not use HOST_CFLAGS to link the make binary.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 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.10 src/tools/make/buildmake.sh.in:1.11
--- src/tools/make/buildmake.sh.in:1.10 Mon Jan 15 19:57:49 2018
+++ src/tools/make/buildmake.sh.in Mon Jan 15 20:14:49 2018
@@ -1,5 +1,5 @@
#! /bin/sh
-# $NetBSD: buildmake.sh.in,v 1.10 2018/01/15 19:57:49 uwe Exp $
+# $NetBSD: buildmake.sh.in,v 1.11 2018/01/15 20:14:49 uwe Exp $
#
# buildmake.sh.in - Autoconf-processed shell script for building make(1).
#
@@ -22,4 +22,4 @@ for f in $MKSRCDIR/*.c $MKSRCDIR/lst.lib
docmd "${HOST_CC} ${HOST_CFLAGS} @DEFS@ -c $f"
done
-docmd "${HOST_CC} ${HOST_CFLAGS} -o ${_TOOL_PREFIX:-nb}make *.o ${HOST_LDFLAGS}"
+docmd "${HOST_CC} -o ${_TOOL_PREFIX:-nb}make *.o ${HOST_LDFLAGS}"
CVS commit: src/tools/make
Module Name:src
Committed By: uwe
Date: Mon Jan 15 19:57:49 UTC 2018
Modified Files:
src/tools/make: buildmake.sh.in
Log Message:
G/c unused runcmd.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 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.9 src/tools/make/buildmake.sh.in:1.10
--- src/tools/make/buildmake.sh.in:1.9 Mon Jan 15 19:52:54 2018
+++ src/tools/make/buildmake.sh.in Mon Jan 15 19:57:49 2018
@@ -1,5 +1,5 @@
#! /bin/sh
-# $NetBSD: buildmake.sh.in,v 1.9 2018/01/15 19:52:54 uwe Exp $
+# $NetBSD: buildmake.sh.in,v 1.10 2018/01/15 19:57:49 uwe Exp $
#
# buildmake.sh.in - Autoconf-processed shell script for building make(1).
#
@@ -9,7 +9,6 @@
: ${HOST_CC="@CC@"}
: ${HOST_CFLAGS="@CPPFLAGS@ @CFLAGS@"}
: ${HOST_LDFLAGS="@LDFLAGS@ @LIBS@"}
-: ${runcmd=""}
docmd () {
echo "$1"
