Module Name: src
Committed By: rillig
Date: Sat Nov 14 22:19:13 UTC 2020
Modified Files:
src/usr.bin/make: main.c make.1
src/usr.bin/make/unit-tests: opt.exp
Log Message:
make(1): document the -S option
This option has been available at least since 1993-03-21, and for the
same time it has been undocumented.
To generate a diff of this commit:
cvs rdiff -u -r1.467 -r1.468 src/usr.bin/make/main.c
cvs rdiff -u -r1.291 -r1.292 src/usr.bin/make/make.1
cvs rdiff -u -r1.3 -r1.4 src/usr.bin/make/unit-tests/opt.exp
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/make/main.c
diff -u src/usr.bin/make/main.c:1.467 src/usr.bin/make/main.c:1.468
--- src/usr.bin/make/main.c:1.467 Sat Nov 14 22:16:17 2020
+++ src/usr.bin/make/main.c Sat Nov 14 22:19:13 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.467 2020/11/14 22:16:17 rillig Exp $ */
+/* $NetBSD: main.c,v 1.468 2020/11/14 22:19:13 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -109,7 +109,7 @@
#include "trace.h"
/* "@(#)main.c 8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: main.c,v 1.467 2020/11/14 22:16:17 rillig Exp $");
+MAKE_RCSID("$NetBSD: main.c,v 1.468 2020/11/14 22:19:13 rillig Exp $");
#if defined(MAKE_NATIVE) && !defined(lint)
__COPYRIGHT("@(#) Copyright (c) 1988, 1989, 1990, 1993 "
"The Regents of the University of California. "
@@ -190,7 +190,7 @@ usage(void)
size_t prognameLen = strcspn(progname, "[");
(void)fprintf(stderr,
-"usage: %.*s [-BeikNnqrstWwX]\n"
+"usage: %.*s [-BeikNnqrSstWwX]\n"
" [-C directory] [-D variable] [-d flags] [-f makefile]\n"
" [-I directory] [-J private] [-j max_jobs] [-m directory] [-T file]\n"
" [-V variable] [-v variable] [variable=value] [target ...]\n",
Index: src/usr.bin/make/make.1
diff -u src/usr.bin/make/make.1:1.291 src/usr.bin/make/make.1:1.292
--- src/usr.bin/make/make.1:1.291 Thu Nov 12 23:35:21 2020
+++ src/usr.bin/make/make.1 Sat Nov 14 22:19:13 2020
@@ -1,4 +1,4 @@
-.\" $NetBSD: make.1,v 1.291 2020/11/12 23:35:21 sjg Exp $
+.\" $NetBSD: make.1,v 1.292 2020/11/14 22:19:13 rillig Exp $
.\"
.\" Copyright (c) 1990, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -29,7 +29,7 @@
.\"
.\" from: @(#)make.1 8.4 (Berkeley) 3/19/94
.\"
-.Dd November 12, 2020
+.Dd November 14, 2020
.Dt MAKE 1
.Os
.Sh NAME
@@ -37,7 +37,7 @@
.Nd maintain program dependencies
.Sh SYNOPSIS
.Nm
-.Op Fl BeikNnqrstWwX
+.Op Fl BeikNnqrSstWwX
.Op Fl C Ar directory
.Op Fl D Ar variable
.Op Fl d Ar flags
@@ -329,6 +329,10 @@ Do not execute any commands, but exit 0
up-to-date and 1, otherwise.
.It Fl r
Do not use the built-in rules specified in the system makefile.
+.It Fl S
+Stop processing if an error is encountered.
+This is the default behavior and the opposite of
+.Fl k .
.It Fl s
Do not echo any commands as they are executed.
Equivalent to specifying
Index: src/usr.bin/make/unit-tests/opt.exp
diff -u src/usr.bin/make/unit-tests/opt.exp:1.3 src/usr.bin/make/unit-tests/opt.exp:1.4
--- src/usr.bin/make/unit-tests/opt.exp:1.3 Sat Nov 14 22:16:17 2020
+++ src/usr.bin/make/unit-tests/opt.exp Sat Nov 14 22:19:13 2020
@@ -1,5 +1,5 @@
make -:
-usage: make [-BeikNnqrstWwX]
+usage: make [-BeikNnqrSstWwX]
[-C directory] [-D variable] [-d flags] [-f makefile]
[-I directory] [-J private] [-j max_jobs] [-m directory] [-T file]
[-V variable] [-v variable] [variable=value] [target ...]
@@ -10,7 +10,7 @@ make: don't know how to make -f (continu
`/dev/null' is up to date.
make -?
-usage: make [-BeikNnqrstWwX]
+usage: make [-BeikNnqrSstWwX]
[-C directory] [-D variable] [-d flags] [-f makefile]
[-I directory] [-J private] [-j max_jobs] [-m directory] [-T file]
[-V variable] [-v variable] [variable=value] [target ...]
