Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/usr.bin/make Non-existent libs are always out of date.
details: https://anonhg.NetBSD.org/src/rev/481204b2e09a
branches: trunk
changeset: 482132:481204b2e09a
user: sjg <sjg%NetBSD.org@localhost>
date: Tue Feb 15 04:41:45 2000 +0000
description:
Non-existent libs are always out of date.
This was not handled correctly on ELF where libs do not have T.O.C.
PR: 9393
Reviewed by: christos
diffstat:
usr.bin/make/arch.c | 9 +++++----
usr.bin/make/make.c | 12 ++++++------
2 files changed, 11 insertions(+), 10 deletions(-)
diffs (76 lines):
diff -r 46e97ff8694b -r 481204b2e09a usr.bin/make/arch.c
--- a/usr.bin/make/arch.c Tue Feb 15 04:03:49 2000 +0000
+++ b/usr.bin/make/arch.c Tue Feb 15 04:41:45 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: arch.c,v 1.31 1999/09/15 08:43:21 mycroft Exp $ */
+/* $NetBSD: arch.c,v 1.32 2000/02/15 04:41:45 sjg Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -39,14 +39,14 @@
*/
#ifdef MAKE_BOOTSTRAP
-static char rcsid[] = "$NetBSD: arch.c,v 1.31 1999/09/15 08:43:21 mycroft Exp $";
+static char rcsid[] = "$NetBSD: arch.c,v 1.32 2000/02/15 04:41:45 sjg Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
#if 0
static char sccsid[] = "@(#)arch.c 8.2 (Berkeley) 1/2/94";
#else
-__RCSID("$NetBSD: arch.c,v 1.31 1999/09/15 08:43:21 mycroft Exp $");
+__RCSID("$NetBSD: arch.c,v 1.32 2000/02/15 04:41:45 sjg Exp $");
#endif
#endif /* not lint */
#endif
@@ -1200,7 +1200,8 @@
oodate = TRUE;
} else if (OP_NOP(gn->type) && Lst_IsEmpty(gn->children)) {
oodate = FALSE;
- } else if ((gn->mtime > now) || (gn->mtime < gn->cmtime)) {
+ } else if ((gn->cmtime == 0) || (gn->mtime > now) ||
+ (gn->mtime < gn->cmtime)) {
oodate = TRUE;
} else {
#ifdef RANLIBMAG
diff -r 46e97ff8694b -r 481204b2e09a usr.bin/make/make.c
--- a/usr.bin/make/make.c Tue Feb 15 04:03:49 2000 +0000
+++ b/usr.bin/make/make.c Tue Feb 15 04:41:45 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: make.c,v 1.25 2000/01/31 13:21:20 sjg Exp $ */
+/* $NetBSD: make.c,v 1.26 2000/02/15 04:41:45 sjg Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -39,14 +39,14 @@
*/
#ifdef MAKE_BOOTSTRAP
-static char rcsid[] = "$NetBSD: make.c,v 1.25 2000/01/31 13:21:20 sjg Exp $";
+static char rcsid[] = "$NetBSD: make.c,v 1.26 2000/02/15 04:41:45 sjg Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
#if 0
static char sccsid[] = "@(#)make.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: make.c,v 1.25 2000/01/31 13:21:20 sjg Exp $");
+__RCSID("$NetBSD: make.c,v 1.26 2000/02/15 04:41:45 sjg Exp $");
#endif
#endif /* not lint */
#endif
@@ -210,10 +210,10 @@
/*
* always out of date if no children and :: target
+ * or non-existent.
*/
-
- oodate = Arch_LibOODate (gn) ||
- ((gn->cmtime == 0) && (gn->type & OP_DOUBLEDEP));
+ oodate = (gn->cmtime == 0 || Arch_LibOODate (gn)
+ || gn->type & OP_DOUBLEDEP);
} else if (gn->type & OP_JOIN) {
/*
* A target with the .JOIN attribute is only considered
Home |
Main Index |
Thread Index |
Old Index