diff options
| author | Marc Espie <espie@cvs.openbsd.org> | 2020-01-13 15:24:32 +0000 |
|---|---|---|
| committer | Marc Espie <espie@cvs.openbsd.org> | 2020-01-13 15:24:32 +0000 |
| commit | 8374869a58b2154d75c0cdbe695da173628d238a (patch) | |
| tree | c09c22059894ee0e26666e01bd3e34405c8a9fb6 /usr.bin/make/make.c | |
| parent | bba3a6ecebe1605aae6b56ea583fc847583551a4 (diff) | |
unify compat mode and parallelmode a bit: there's no longer a need for
handle_one_job, always go thru Job_Make now.
Diffstat (limited to 'usr.bin/make/make.c')
| -rw-r--r-- | usr.bin/make/make.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/usr.bin/make/make.c b/usr.bin/make/make.c index b47520be739..adec6cb38f4 100644 --- a/usr.bin/make/make.c +++ b/usr.bin/make/make.c @@ -1,4 +1,4 @@ -/* $OpenBSD: make.c,v 1.79 2020/01/13 15:15:17 espie Exp $ */ +/* $OpenBSD: make.c,v 1.80 2020/01/13 15:24:31 espie Exp $ */ /* $NetBSD: make.c,v 1.10 1996/11/06 17:59:15 christos Exp $ */ /* @@ -377,7 +377,13 @@ try_to_make_node(GNode *gn) return true; /* SIB: this is where commands should get prepared */ Make_DoAllVar(gn); - Job_Make(gn); + if (node_find_valid_commands(gn)) { + if (touchFlag) + Job_Touch(gn); + else + Job_Make(gn); + } else + node_failure(gn); } else { if (DEBUG(MAKE)) printf("up-to-date\n"); |