Module Name: src
Committed By: rillig
Date: Sun Jul 26 09:17:24 UTC 2020
Modified Files:
src: build.sh
src/tools/make: buildmake.sh.in
Log Message:
make(1): remove references to the removed lst.lib
To generate a diff of this commit:
cvs rdiff -u -r1.342 -r1.343 src/build.sh
cvs rdiff -u -r1.15 -r1.16 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/build.sh
diff -u src/build.sh:1.342 src/build.sh:1.343
--- src/build.sh:1.342 Tue Jun 30 21:22:19 2020
+++ src/build.sh Sun Jul 26 09:17:24 2020
@@ -1,5 +1,5 @@
#! /usr/bin/env sh
-# $NetBSD: build.sh,v 1.342 2020/06/30 21:22:19 riastradh Exp $
+# $NetBSD: build.sh,v 1.343 2020/07/26 09:17:24 rillig Exp $
#
# Copyright (c) 2001-2011 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -1664,7 +1664,7 @@ rebuildmake()
{
make="$(print_tooldir_make)"
if [ -n "${make}" ] && [ -x "${make}" ]; then
- for f in usr.bin/make/*.[ch] usr.bin/make/lst.lib/*.[ch]; do
+ for f in usr.bin/make/*.[ch]; do
if [ "${f}" -nt "${make}" ]; then
statusmsg "${make} outdated" \
"(older than ${f}), needs building."
@@ -1698,7 +1698,7 @@ rebuildmake()
bomb "Build of ${toolprefix}make failed"
make="${tmpdir}/${toolprefix}make"
${runcmd} cd "${TOP}"
- ${runcmd} rm -f usr.bin/make/*.o usr.bin/make/lst.lib/*.o
+ ${runcmd} rm -f usr.bin/make/*.o
done_rebuildmake=true
}
@@ -1961,7 +1961,7 @@ createmakewrapper()
eval cat <<EOF ${makewrapout}
#! ${HOST_SH}
# Set proper variables to allow easy "make" building of a NetBSD subtree.
-# Generated from: \$NetBSD: build.sh,v 1.342 2020/06/30 21:22:19 riastradh Exp $
+# Generated from: \$NetBSD: build.sh,v 1.343 2020/07/26 09:17:24 rillig Exp $
# with these arguments: ${_args}
#
Index: src/tools/make/buildmake.sh.in
diff -u src/tools/make/buildmake.sh.in:1.15 src/tools/make/buildmake.sh.in:1.16
--- src/tools/make/buildmake.sh.in:1.15 Sat Jun 13 11:39:43 2020
+++ src/tools/make/buildmake.sh.in Sun Jul 26 09:17:24 2020
@@ -1,5 +1,5 @@
#! /bin/sh
-# $NetBSD: buildmake.sh.in,v 1.15 2020/06/13 11:39:43 lukem Exp $
+# $NetBSD: buildmake.sh.in,v 1.16 2020/07/26 09:17:24 rillig Exp $
#
# buildmake.sh.in - Autoconf-processed shell script for building make(1).
#
@@ -28,7 +28,7 @@ docmd () {
$3 || exit 1
}
-for f in $MKSRCDIR/*.c $MKSRCDIR/lst.lib/*.c; do
+for f in $MKSRCDIR/*.c; do
docmd "compile " "$f" "${_CC} ${_CFLAGS} -c $f"
done
