diff options
| author | Todd C. Miller <millert@cvs.openbsd.org> | 1997-04-20 22:28:26 +0000 |
|---|---|---|
| committer | Todd C. Miller <millert@cvs.openbsd.org> | 1997-04-20 22:28:26 +0000 |
| commit | c35ff616de09ecd94952972f47bba0f21d37b4b8 (patch) | |
| tree | 53b4552b802bfb9152badab975706880174fa405 /usr.bin | |
| parent | 9b6718ff853bca192153704c82576351bd0d1723 (diff) | |
Back out the following change since it introduces an ordering problem:
in compat mode, expand .USE before evaluating the list of targets,
instead of doing .USE expansions on demand, because they can cause
tree restructuring.
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/make/compat.c | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/usr.bin/make/compat.c b/usr.bin/make/compat.c index a7e63cc19ce..e926575a156 100644 --- a/usr.bin/make/compat.c +++ b/usr.bin/make/compat.c @@ -1,4 +1,4 @@ -/* $OpenBSD: compat.c,v 1.5 1997/04/01 07:28:09 millert Exp $ */ +/* $OpenBSD: compat.c,v 1.6 1997/04/20 22:28:25 millert Exp $ */ /* $NetBSD: compat.c,v 1.18 1997/03/28 22:31:22 christos Exp $ */ /* @@ -43,7 +43,7 @@ #if 0 static char sccsid[] = "@(#)compat.c 8.2 (Berkeley) 3/19/94"; #else -static char rcsid[] = "$OpenBSD: compat.c,v 1.5 1997/04/01 07:28:09 millert Exp $"; +static char rcsid[] = "$OpenBSD: compat.c,v 1.6 1997/04/20 22:28:25 millert Exp $"; #endif #endif /* not lint */ @@ -367,12 +367,9 @@ CompatMake (gnp, pgnp) GNode *gn = (GNode *) gnp; GNode *pgn = (GNode *) pgnp; - if (pgn->type & OP_MADE) { - (void) Dir_MTime(gn); - gn->made = UPTODATE; - } - - if (gn->made == UNMADE) { + if (gn->type & OP_USE) { + Make_HandleUse(gn, pgn); + } else if (gn->made == UNMADE) { /* * First mark ourselves to be made, then apply whatever transformations * the suffix module thinks are necessary. Once that's done, we can @@ -632,12 +629,6 @@ Compat_Run(targs) } /* - * Expand .USE nodes right now, because they can modify the structure - * of the tree. - */ - Lst_Destroy(Make_ExpandUse(targs), NOFREE); - - /* * For each entry in the list of targets to create, call CompatMake on * it to create the thing. CompatMake will leave the 'made' field of gn * in one of several states: |