===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/make/engine.c,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- src/usr.bin/make/engine.c	2017/07/24 12:08:15	1.54
+++ src/usr.bin/make/engine.c	2018/11/27 09:33:48	1.55
@@ -1,4 +1,4 @@
-/*	$OpenBSD: engine.c,v 1.54 2017/07/24 12:08:15 espie Exp $ */
+/*	$OpenBSD: engine.c,v 1.55 2018/11/27 09:33:48 espie Exp $ */
 /*
  * Copyright (c) 2012 Marc Espie.
  *
@@ -121,14 +121,6 @@
 bool
 node_find_valid_commands(GNode *gn)
 {
-	/* Alter our type to tell if errors should be ignored or things
-	 * should not be printed so setup_and_run_command knows what to do.
-	 */
-	if (Targ_Ignore(gn))
-		gn->type |= OP_IGNORE;
-	if (Targ_Silent(gn))
-		gn->type |= OP_SILENT;
-
 	if (DEBUG(DOUBLE) && (gn->type & OP_DOUBLE))
 		fprintf(stderr, "Warning: target %s had >1 lists of "
 		    "shell commands (ignoring later ones)\n", gn->name);
@@ -258,7 +250,7 @@
 		return;
 	}
 
-	if (!(gn->type & OP_SILENT)) {
+	if (!Targ_Silent(gn)) {
 		(void)fprintf(stdout, "touch %s\n", gn->name);
 		(void)fflush(stdout);
 	}
@@ -742,8 +734,8 @@
 	pid_t cpid; 	/* Child pid */
 
 	const char *cmd = job->cmd;
-	silent = job->node->type & OP_SILENT;
-	errCheck = !(job->node->type & OP_IGNORE);
+	silent = Targ_Silent(job->node);
+	errCheck = !Targ_Ignore(job->node);
 	if (job->node->type & OP_MAKE)
 		doExecute = true;
 	else