make: proper handling of build failure with '-k'

When a build command fails and the '-k' option (continue on error)
is in effect, no further commands should be executed for the
current target.

Also, the resulting diagnostic should be reported to stderr.  As
should the final 'not built due to errors' diagnostic.

Adds 80 bytes.

(pdpmake GitHub issue 35)

2 files changed, 22 insertions, 3 deletions

diff --git a/miscutils/make.c b/miscutils/make.c
index 785e25f7d..841daa93e 100644
--- a/miscutils/make.c
+++ b/miscutils/make.c
@@ -2221,9 +2221,14 @@ docmds(struct name *np, struct cmd *cp)
                         } else if (status != 0 && !signore) {
                                 if (!posix && WIFSIGNALED(status))
                                         remove_target();
-                                if (errcont || doinclude) {
-                                        warning("failed to build '%s'", np->n_name);
+                                if (errcont) {
+                                        diagnostic("failed to build '%s'", np->n_name);
                                         estat |= MAKE_FAILURE;
+                                        free(command);
+                                        free(cmd);
+                                        break;
+                                } else if (doinclude) {
+                                        warning("failed to build '%s'", np->n_name);
                                 } else {
                                         const char *err_type = NULL;
                                         int err_value;
@@ -2488,7 +2493,7 @@ make(struct name *np, int level)
                         else if (!doinclude && level == 0 && !(estat & MAKE_DIDSOMETHING))
                                 warning("nothing to be done for %s", np->n_name);
                 } else if (!doinclude) {
-                        warning("'%s' not built due to errors", np->n_name);
+                        diagnostic("'%s' not built due to errors", np->n_name);
                 }
                 free(oodate);
         }
diff --git a/testsuite/make.tests b/testsuite/make.tests
index 3c2aa5cf5..745a840f3 100755
--- a/testsuite/make.tests
+++ b/testsuite/make.tests
@@ -102,6 +102,20 @@ a = a
 target:;@echo a = $(a)
 '
 
+# When a build command fails and the '-k' option has been provided
+# (continue execution on error) no further commands should be executed
+# for the current target.
+testing "make failure of build command with -k" \
+        "make -k -f - 2>/dev/null" "OK\n" "" '
+all: bar baz
+bar:
+        @echo OK
+        @false
+        @echo Not reached
+baz:
+        @:
+'
+
 # A macro created using ::= remembers it's of type immediate-expansion.
 # Immediate expansion also occurs when += is used to append to such a macro.
 testing "make appending to immediate-expansion macro" \