diff options
| author | rillig <rillig@NetBSD.org> | 2020-11-14 22:19:13 +0000 |
|---|---|---|
| committer | rillig <rillig@NetBSD.org> | 2020-11-14 22:19:13 +0000 |
| commit | 5950d85fab0cf8ebd654ae68ee2d2d020813f8bb (patch) | |
| tree | 6b7c22f2a9b2191fc5002bdd5af7ad0a64f3557b /usr.bin/make | |
| parent | 9d418facb6f034f79ca7236a78c06a7dcea506d1 (diff) | |
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.
Diffstat (limited to 'usr.bin/make')
| -rw-r--r-- | usr.bin/make/main.c | 6 | ||||
| -rw-r--r-- | usr.bin/make/make.1 | 10 | ||||
| -rw-r--r-- | usr.bin/make/unit-tests/opt.exp | 4 |
3 files changed, 12 insertions, 8 deletions
diff --git a/usr.bin/make/main.c b/usr.bin/make/main.c index b1ffdc89d07..1b0ffafd2db 100644 --- a/usr.bin/make/main.c +++ b/usr.bin/make/main.c @@ -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", diff --git a/usr.bin/make/make.1 b/usr.bin/make/make.1 index a177e5d157b..1c7e6194db4 100644 --- a/usr.bin/make/make.1 +++ b/usr.bin/make/make.1 @@ -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 if the specified targets are 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 diff --git a/usr.bin/make/unit-tests/opt.exp b/usr.bin/make/unit-tests/opt.exp index 0dfe351899c..06e3c1065c9 100644 --- a/usr.bin/make/unit-tests/opt.exp +++ b/usr.bin/make/unit-tests/opt.exp @@ -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 (continuing) `/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 ...] |
