mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2025-01-04 12:52:15 +00:00
Code Issues Releases Activity

Fix wildcard srcs for phony targets

Browse Source
This commit is contained in:
Simon J. Gerraty 2013-05-18 13:24:53 +00:00
parent 2c6a3af9ab
commit 4fc82fe44c
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=250773
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
contrib/bmake/suff.c
View File

@ -2058,6 +2058,10 @@ SuffFindNormalDeps(GNode *gn, Lst slst)
* children, then look for any overriding transformations they imply. * children, then look for any overriding transformations they imply.
* Should we find one, we discard the one we found before. * Should we find one, we discard the one we found before.
*/ */
bottom = NULL;
targ = NULL;
if (!(gn->type & OP_PHONY)) {
while (ln != NULL) { while (ln != NULL) {
/* /*
@ -2171,6 +2175,7 @@ SuffFindNormalDeps(GNode *gn, Lst slst)
for (targ = bottom; targ->parent != NULL; targ = targ->parent) for (targ = bottom; targ->parent != NULL; targ = targ->parent)
continue; continue;
} }
}
Var_Set(TARGET, gn->path ? gn->path : gn->name, gn, 0); Var_Set(TARGET, gn->path ? gn->path : gn->name, gn, 0);
@ -2419,12 +2424,7 @@ SuffFindDeps(GNode *gn, Lst slst)
*/ */
Var_Set(TARGET, gn->path ? gn->path : gn->name, gn, 0); Var_Set(TARGET, gn->path ? gn->path : gn->name, gn, 0);
Var_Set(PREFIX, gn->name, gn, 0); Var_Set(PREFIX, gn->name, gn, 0);
if (gn->type & OP_PHONY) {
/*
* If this is a .PHONY target, we do not apply suffix rules.
*/
return;
}
if (DEBUG(SUFF)) { if (DEBUG(SUFF)) {
fprintf(debug_file, "SuffFindDeps (%s)\n", gn->name); fprintf(debug_file, "SuffFindDeps (%s)\n", gn->name);
} }