===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/make/compat.c,v
retrieving revision 1.87
retrieving revision 1.88
diff -c -r1.87 -r1.88
*** src/usr.bin/make/compat.c	2019/12/21 15:28:16	1.87
--- src/usr.bin/make/compat.c	2019/12/21 15:29:25	1.88
***************
*** 1,4 ****
! /*	$OpenBSD: compat.c,v 1.87 2019/12/21 15:28:16 espie Exp $	*/
  /*	$NetBSD: compat.c,v 1.14 1996/11/06 17:59:01 christos Exp $	*/
  
  /*
--- 1,4 ----
! /*	$OpenBSD: compat.c,v 1.88 2019/12/21 15:29:25 espie Exp $	*/
  /*	$NetBSD: compat.c,v 1.14 1996/11/06 17:59:01 christos Exp $	*/
  
  /*
***************
*** 112,118 ****
  
  	switch(gn->built_status) {
  	case UNKNOWN: 
! 		/* First mark ourselves to be made, then apply whatever
  		 * transformations the suffix module thinks are necessary.
  		 * Once that's done, we can descend and make all our children.
  		 * If any of them has an error but the -k flag was given,
--- 112,118 ----
  
  	switch(gn->built_status) {
  	case UNKNOWN: 
! 		/* First mark ourselves to be built, then apply whatever
  		 * transformations the suffix module thinks are necessary.
  		 * Once that's done, we can descend and make all our children.
  		 * If any of them has an error but the -k flag was given,
***************
*** 139,145 ****
  			return;
  		}
  
! 		/* All the children were made ok. Now youngest points to
  		 * the newest child, we need to find out
  		 * if we exist and when we were modified last. The criteria
  		 * for datedness are defined by the Make_OODate function.  */
--- 139,145 ----
  			return;
  		}
  
! 		/* All the children built ok. Now youngest points to
  		 * the newest child, we need to find out
  		 * if we exist and when we were modified last. The criteria
  		 * for datedness are defined by the Make_OODate function.  */
***************
*** 163,169 ****
  		 */
  		sib = gn;
  		do {
! 			/* We need to be re-made. We also have to make sure
  			 * we've got a $?  variable. To be nice, we also define
  			 * the $> variable using Make_DoAllVar().
  			 */
--- 163,169 ----
  		 */
  		sib = gn;
  		do {
! 			/* We need to be rebuilt. We also have to make sure
  			 * we've got a $?  variable. To be nice, we also define
  			 * the $> variable using Make_DoAllVar().
  			 */
***************
*** 194,200 ****
  		gn->built_status = sib->built_status;
  
  		if (gn->built_status != ERROR) {
! 			/* If the node was made successfully, mark it so,
  			 * update its modification time and timestamp all
  			 * its parents.
  			 * This is to keep its state from affecting that of
--- 194,200 ----
  		gn->built_status = sib->built_status;
  
  		if (gn->built_status != ERROR) {
! 			/* If the node was built successfully, mark it so,
  			 * update its modification time and timestamp all
  			 * its parents.
  			 * This is to keep its state from affecting that of
***************
*** 231,237 ****
  				printf("update time: %s\n",
  				    time_to_string(&gn->mtime));
  			if (!(gn->type & OP_EXEC)) {
! 				pgn->childMade = true;
  				Make_TimeStamp(pgn, gn);
  			}
  		} else if (keepgoing)
--- 231,237 ----
  				printf("update time: %s\n",
  				    time_to_string(&gn->mtime));
  			if (!(gn->type & OP_EXEC)) {
! 				pgn->child_rebuilt = true;
  				Make_TimeStamp(pgn, gn);
  			}
  		} else if (keepgoing)
***************
*** 253,259 ****
  		break;
  	case REBUILT:
  		if ((gn->type & OP_EXEC) == 0) {
! 			pgn->childMade = true;
  			Make_TimeStamp(pgn, gn);
  		}
  		break;
--- 253,259 ----
  		break;
  	case REBUILT:
  		if ((gn->type & OP_EXEC) == 0) {
! 			pgn->child_rebuilt = true;
  			Make_TimeStamp(pgn, gn);
  		}
  		break;
***************
*** 270,276 ****
  Compat_Run(Lst targs)		/* List of target nodes to re-create */
  {
  	GNode	  *gn = NULL;	/* Current root target */
! 	int 	  errors;   	/* Number of targets not remade due to errors */
  
  	/* For each entry in the list of targets to create, call CompatMake on
  	 * it to create the thing. CompatMake will leave the 'built_status'
--- 270,276 ----
  Compat_Run(Lst targs)		/* List of target nodes to re-create */
  {
  	GNode	  *gn = NULL;	/* Current root target */
! 	int 	  errors;   	/* Number of targets not built due to errors */
  
  	/* For each entry in the list of targets to create, call CompatMake on
  	 * it to create the thing. CompatMake will leave the 'built_status'
***************
*** 279,287 ****
  	 *	    REBUILT	    gn was recreated successfully
  	 *	    ERROR	    An error occurred while gn was being
  	 *                          created
! 	 *	    ABORTED	    gn was not remade because one of its
! 	 *                          inferiors could not be made due to errors.
! 	 */
  	errors = 0;
  	while ((gn = Lst_DeQueue(targs)) != NULL) {
  		CompatMake(gn, NULL);
--- 279,287 ----
  	 *	    REBUILT	    gn was recreated successfully
  	 *	    ERROR	    An error occurred while gn was being
  	 *                          created
! 	 *	    ABORTED	    gn was not built because one of its
! 	 *                          dependencies could not be built due 
! 	 *		      	    to errors.  */
  	errors = 0;
  	while ((gn = Lst_DeQueue(targs)) != NULL) {
  		CompatMake(gn, NULL);