Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/usr.bin/make Fix another case where we stat(2)ed .PHONY targ...



details:   https://anonhg.NetBSD.org/src/rev/d67d0f3b1e14
branches:  trunk
changeset: 476375:d67d0f3b1e14
user:      mycroft <mycroft%NetBSD.org@localhost>
date:      Wed Sep 15 05:56:33 1999 +0000

description:
Fix another case where we stat(2)ed .PHONY targets.

diffstat:

 usr.bin/make/dir.c |  12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

diffs (39 lines):

diff -r 2f94dfc9294d -r d67d0f3b1e14 usr.bin/make/dir.c
--- a/usr.bin/make/dir.c        Wed Sep 15 04:16:31 1999 +0000
+++ b/usr.bin/make/dir.c        Wed Sep 15 05:56:33 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: dir.c,v 1.22 1999/07/12 17:29:32 thorpej Exp $ */
+/*     $NetBSD: dir.c,v 1.23 1999/09/15 05:56:33 mycroft Exp $ */
 
 /*
  * Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -39,14 +39,14 @@
  */
 
 #ifdef MAKE_BOOTSTRAP
-static char rcsid[] = "$NetBSD: dir.c,v 1.22 1999/07/12 17:29:32 thorpej Exp $";
+static char rcsid[] = "$NetBSD: dir.c,v 1.23 1999/09/15 05:56:33 mycroft Exp $";
 #else
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)dir.c      8.2 (Berkeley) 1/2/94";
 #else
-__RCSID("$NetBSD: dir.c,v 1.22 1999/07/12 17:29:32 thorpej Exp $");
+__RCSID("$NetBSD: dir.c,v 1.23 1999/09/15 05:56:33 mycroft Exp $");
 #endif
 #endif /* not lint */
 #endif
@@ -1142,8 +1142,10 @@
 
     if (gn->type & OP_ARCHV) {
        return Arch_MTime (gn);
-    } else if (gn->path == (char *)NULL) {
-       if (gn->type & (OP_PHONY|OP_NOPATH))
+    } else if (gn->type & OP_PHONY)
+       return 0;
+    else if (gn->path == (char *)NULL) {
+       if (gn->type & OP_NOPATH)
            fullName = NULL;
        else
            fullName = Dir_FindFile (gn->name, dirSearchPath);



Home | Main Index | Thread Index | Old Index