summaryrefslogtreecommitdiffstats
path: root/usr.bin/make/make.c
diff options
context:
space:
mode:
authorfjoe <fjoe@FreeBSD.org>2008-12-18 12:16:51 +0000
committerfjoe <fjoe@FreeBSD.org>2008-12-18 12:16:51 +0000
commit95c5b12c17caea660098332fcad5d02b98688e38 (patch)
treec1784caf6d6db98b1fc61e02c2bfffdfed661c9d /usr.bin/make/make.c
parent068931a9897e3bea2e9c192f392fe5548cbed6ce (diff)
downloadFreeBSD-src-95c5b12c17caea660098332fcad5d02b98688e38.zip
FreeBSD-src-95c5b12c17caea660098332fcad5d02b98688e38.tar.gz
Exit with error code 2 when run with -k (continue if errors) and build failed.
Diffstat (limited to 'usr.bin/make/make.c')
-rw-r--r--usr.bin/make/make.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/usr.bin/make/make.c b/usr.bin/make/make.c
index 4ac5bb6..835e855 100644
--- a/usr.bin/make/make.c
+++ b/usr.bin/make/make.c
@@ -713,7 +713,6 @@ Make_Run(Lst *targs)
GNode *gn; /* a temporary pointer */
GNode *cgn;
Lst examine; /* List of targets to examine */
- int errors; /* Number of errors the Job module reports */
LstNode *ln;
Lst_Init(&examine);
@@ -793,15 +792,14 @@ Make_Run(Lst *targs)
MakeStartJobs();
}
- errors = Job_Finish();
+ Job_Finish();
/*
* Print the final status of each target. E.g. if it wasn't made
* because some inferior reported an error.
*/
- errors = ((errors == 0) && (numNodes != 0));
LST_FOREACH(ln, targs)
- MakePrintStatus(Lst_Datum(ln), errors);
+ MakePrintStatus(Lst_Datum(ln), (makeErrors == 0) && (numNodes != 0));
return (TRUE);
}
OpenPOWER on IntegriCloud