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

Don't apply the default suffix rules for nodes that are not in our 

current directory because we could be building things outside our
directory that were not meant to be build... Fixes PR/1488
This commit is contained in:
christos 1995-09-22 00:42:10 +00:00
parent 08cae70f24
commit ae8c2b9dd3
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
/* $NetBSD: suff.c,v 1.8 1995/06/14 15:19:59 christos Exp $ */
/* $NetBSD: suff.c,v 1.9 1995/09/22 00:42:10 christos Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@ -42,7 +42,7 @@
#if 0
static char sccsid[] = "@(#)suff.c 5.6 (Berkeley) 6/1/90";
#else
static char rcsid[] = "$NetBSD: suff.c,v 1.8 1995/06/14 15:19:59 christos Exp $";
static char rcsid[] = "$NetBSD: suff.c,v 1.9 1995/09/22 00:42:10 christos Exp $";
#endif
#endif /* not lint */
@ -1427,7 +1427,7 @@ SuffExpandChildren(cgnp, pgnp)
/*
* Add all elements of the members list to the parent node.
*/
while(!Lst_IsEmpty(members)) {
while (!Lst_IsEmpty(members)) {
gn = (GNode *)Lst_DeQueue(members);
if (DEBUG(SUFF)) {
@ -1829,6 +1829,16 @@ SuffFindNormalDeps(gn, slst)
srcs = Lst_Init(FALSE);
targs = Lst_Init(FALSE);
/*
* We do not apply suffix rules to nodes that are not in our directory.
* If we did that, then we could be building things in the current
* directory that should be build somewhere else.
*/
if (strchr(gn->name, '/') != NULL) {
ln = NILLNODE;
if (DEBUG(SUFF))
printf("Not applying suffix rules rules to %s\n", gn->name);
}
/*
* We're caught in a catch-22 here. On the one hand, we want to use any
* transformation implied by the target's sources, but we can't examine
@ -1847,7 +1857,8 @@ SuffFindNormalDeps(gn, slst)
* children, then look for any overriding transformations they imply.
* Should we find one, we discard the one we found before.
*/
while(ln != NILLNODE) {
while (ln != NILLNODE) {
/*
* Look for next possible suffix...
*/