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

Don't (try to) use files marked .OPTIONAL as implicit sources.

Browse Source 
There existance hasn't been verified at the point the implicit rules are
checked.
This commit is contained in:
dsl 2006-01-08 12:59:52 +00:00
parent d0fb2fc679
commit 07c6949e33
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
usr.bin/make/suff.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: suff.c,v 1.51 2005/08/08 16:42:54 christos Exp $ */
/* $NetBSD: suff.c,v 1.52 2006/01/08 12:59:52 dsl Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@ -69,14 +69,14 @@
*/
#ifndef MAKE_NATIVE
static char rcsid[] = "$NetBSD: suff.c,v 1.51 2005/08/08 16:42:54 christos Exp $";
static char rcsid[] = "$NetBSD: suff.c,v 1.52 2006/01/08 12:59:52 dsl Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
#if 0
static char sccsid[] = "@(#)suff.c 8.4 (Berkeley) 3/21/94";
#else
__RCSID("$NetBSD: suff.c,v 1.51 2005/08/08 16:42:54 christos Exp $");
__RCSID("$NetBSD: suff.c,v 1.52 2006/01/08 12:59:52 dsl Exp $");
#endif
#endif /* not lint */
#endif
@ -1428,6 +1428,17 @@ SuffFindCmds(Src *targ, Lst slst)
}
s = (GNode *)Lst_Datum(ln);
if (s->type & OP_OPTIONAL && Lst_IsEmpty(t->commands)) {
/*
* We haven't looked to see if .OPTIONAL files exist yet, so
* don't use one as the implicit source.
* This allows us to use .OPTIONAL in .depend files so make won't
* complain "don't know how to make xxx.h' when a dependant file
* has been moved/deleted.
*/
continue;
}
cp = strrchr(s->name, '/');
if (cp == NULL) {
cp = s->name;