diff options
| author | sjg <sjg@FreeBSD.org> | 2016-03-18 20:03:09 +0000 |
|---|---|---|
| committer | sjg <sjg@FreeBSD.org> | 2016-03-18 20:03:09 +0000 |
| commit | 44636d2ebbf1d88dbc6daceafbef7b9b0e8c4a89 (patch) | |
| tree | 441a6072996940eb112c1cbfdd9f818d1781c000 /contrib/bmake/meta.c | |
| parent | 43ceb1fb4c836b9d1711b2f40fb12b0d31a478e0 (diff) | |
| download | FreeBSD-src-44636d2ebbf1d88dbc6daceafbef7b9b0e8c4a89.zip FreeBSD-src-44636d2ebbf1d88dbc6daceafbef7b9b0e8c4a89.tar.gz | |
Update to bmake-20160315
Archive member handling works again
meta mode, treat missing reads as for writes.
Update dirdeps.mk - much improved startup time.
Update meta.stage.mk - avoid ln when chmod required.
Diffstat (limited to 'contrib/bmake/meta.c')
| -rw-r--r-- | contrib/bmake/meta.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/contrib/bmake/meta.c b/contrib/bmake/meta.c index f4acbde..4faf836 100644 --- a/contrib/bmake/meta.c +++ b/contrib/bmake/meta.c @@ -1,4 +1,4 @@ -/* $NetBSD: meta.c,v 1.53 2016/03/07 21:45:43 christos Exp $ */ +/* $NetBSD: meta.c,v 1.54 2016/03/11 07:01:21 sjg Exp $ */ /* * Implement 'meta' mode. @@ -1190,7 +1190,8 @@ meta_oodate(GNode *gn, Boolean oodate) if ((link_src != NULL && lstat(p, &fs) < 0) || (link_src == NULL && stat(p, &fs) < 0)) { - Lst_AtEnd(missingFiles, bmake_strdup(p)); + if (Lst_Find(missingFiles, p, string_match) == NULL) + Lst_AtEnd(missingFiles, bmake_strdup(p)); } break; check_link_src: @@ -1281,9 +1282,8 @@ meta_oodate(GNode *gn, Boolean oodate) * A referenced file outside of CWD is missing. * We cannot catch every eventuality here... */ - if (DEBUG(META)) - fprintf(debug_file, "%s: %d: file '%s' may have moved?...\n", fname, lineno, p); - oodate = TRUE; + if (Lst_Find(missingFiles, p, string_match) == NULL) + Lst_AtEnd(missingFiles, bmake_strdup(p)); } } if (buf[0] == 'E') { |
