Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/usr.bin/make make(1): explain seemingly redundant condition ...
details: https://anonhg.NetBSD.org/src/rev/189cc81ed089
branches: trunk
changeset: 980254:189cc81ed089
user: rillig <rillig%NetBSD.org@localhost>
date: Fri Jan 29 23:45:35 2021 +0000
description:
make(1): explain seemingly redundant condition in jobs mode
diffstat:
usr.bin/make/job.c | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diffs (32 lines):
diff -r 148d996b7728 -r 189cc81ed089 usr.bin/make/job.c
--- a/usr.bin/make/job.c Fri Jan 29 23:33:24 2021 +0000
+++ b/usr.bin/make/job.c Fri Jan 29 23:45:35 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: job.c,v 1.401 2021/01/29 23:33:24 rillig Exp $ */
+/* $NetBSD: job.c,v 1.402 2021/01/29 23:45:35 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -143,7 +143,7 @@
#include "trace.h"
/* "@(#)job.c 8.2 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: job.c,v 1.401 2021/01/29 23:33:24 rillig Exp $");
+MAKE_RCSID("$NetBSD: job.c,v 1.402 2021/01/29 23:45:35 rillig Exp $");
/*
* A shell defines how the commands are run. All commands for a target are
@@ -1672,9 +1672,11 @@
} else if (((gn->type & OP_MAKE) && !opts.noRecursiveExecute) ||
(!opts.noExecute && !opts.touchFlag)) {
/*
- * XXX: The above conditions seem needlessly repeated but
- * are subtly different.
+ * The above conditions look very similar to
+ * GNode_ShouldExecute but are subtly different.
+ * They prevent that .MAKE targets are touched.
*/
+
JobWriteShellCommands(job, gn, cmdsOK, &run);
(void)fflush(job->cmdFILE);
} else if (!GNode_ShouldExecute(gn)) {
Home |
Main Index |
Thread Index |
Old Index