=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/make/make.c,v retrieving revision 1.64 retrieving revision 1.65 diff -c -r1.64 -r1.65 *** src/usr.bin/make/make.c 2012/10/09 19:49:28 1.64 --- src/usr.bin/make/make.c 2012/12/08 12:54:17 1.65 *************** *** 1,4 **** ! /* $OpenBSD: make.c,v 1.64 2012/10/09 19:49:28 espie Exp $ */ /* $NetBSD: make.c,v 1.10 1996/11/06 17:59:15 christos Exp $ */ /* --- 1,4 ---- ! /* $OpenBSD: make.c,v 1.65 2012/12/08 12:54:17 espie Exp $ */ /* $NetBSD: make.c,v 1.10 1996/11/06 17:59:15 christos Exp $ */ /* *************** *** 572,578 **** bool Make_Run(Lst targs) /* the initial list of targets */ { ! int errors; /* Number of errors the Job module reports */ GNode *gn; unsigned int i; bool cycle; --- 572,578 ---- bool Make_Run(Lst targs) /* the initial list of targets */ { ! bool problem; /* errors occurred */ GNode *gn; unsigned int i; bool cycle; *************** *** 619,625 **** (void)MakeStartJobs(); } ! errors = Job_Finish(); cycle = false; for (gn = ohash_first(&targets, &i); gn != NULL; --- 619,625 ---- (void)MakeStartJobs(); } ! problem = Job_Finish(); cycle = false; for (gn = ohash_first(&targets, &i); gn != NULL; *************** *** 627,633 **** if (has_been_built(gn)) continue; cycle = true; ! errors++; printf("Error: target %s unaccounted for (%s)\n", gn->name, status_to_string(gn)); } --- 627,633 ---- if (has_been_built(gn)) continue; cycle = true; ! problem = true; printf("Error: target %s unaccounted for (%s)\n", gn->name, status_to_string(gn)); } *************** *** 636,642 **** * because some inferior reported an error. */ Lst_ForEach(targs, MakePrintStatus, &cycle); ! if (errors) Fatal("Errors while building"); return true; --- 636,642 ---- * because some inferior reported an error. */ Lst_ForEach(targs, MakePrintStatus, &cycle); ! if (problem) Fatal("Errors while building"); return true;