Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix a bug in the previous. In the `compat' case, we don't actually use the 

list of target nodes returned by Make_ExpandUse().  We have to search the
cohorts explicitly while iterating through the tree.  So, tweak CompatMake()
to do this.
This commit is contained in:
mycroft 1999-09-16 00:49:48 +00:00
parent ef22c28d6f
commit ce14db1fcd
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
usr.bin/make/compat.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: compat.c,v 1.27 1999/03/24 13:19:26 sommerfe Exp $ */ /* $NetBSD: compat.c,v 1.28 1999/09/16 00:49:48 mycroft Exp $ */
/* /*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California. * Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@ -39,14 +39,14 @@
*/ */
#ifdef MAKE_BOOTSTRAP #ifdef MAKE_BOOTSTRAP
static char rcsid[] = "$NetBSD: compat.c,v 1.27 1999/03/24 13:19:26 sommerfe Exp $"; static char rcsid[] = "$NetBSD: compat.c,v 1.28 1999/09/16 00:49:48 mycroft Exp $";
#else #else
#include <sys/cdefs.h> #include <sys/cdefs.h>
#ifndef lint #ifndef lint
#if 0 #if 0
static char sccsid[] = "@(#)compat.c 8.2 (Berkeley) 3/19/94"; static char sccsid[] = "@(#)compat.c 8.2 (Berkeley) 3/19/94";
#else #else
__RCSID("$NetBSD: compat.c,v 1.27 1999/03/24 13:19:26 sommerfe Exp $"); __RCSID("$NetBSD: compat.c,v 1.28 1999/09/16 00:49:48 mycroft Exp $");
#endif #endif
#endif /* not lint */ #endif /* not lint */
#endif #endif
@ -394,7 +394,7 @@ CompatMake (gnp, pgnp)
if ((gn->flags & REMAKE) == 0) { if ((gn->flags & REMAKE) == 0) {
gn->made = ABORTED; gn->made = ABORTED;
pgn->flags &= ~REMAKE; pgn->flags &= ~REMAKE;
return (0); goto cohorts;
} }
if (Lst_Member (gn->iParents, pgn) != NILLNODE) { if (Lst_Member (gn->iParents, pgn) != NILLNODE) {
@ -418,7 +418,7 @@ CompatMake (gnp, pgnp)
if (DEBUG(MAKE)) { if (DEBUG(MAKE)) {
printf("up-to-date.\n"); printf("up-to-date.\n");
} }
return (0); goto cohorts;
} else if (DEBUG(MAKE)) { } else if (DEBUG(MAKE)) {
printf("out-of-date.\n"); printf("out-of-date.\n");
} }
@ -519,6 +519,8 @@ CompatMake (gnp, pgnp)
} }
} }
cohorts:
Lst_ForEach (gn->cohorts, CompatMake, pgnp);
return (0); return (0);
} }