summaryrefslogtreecommitdiffstats
path: root/contrib/bmake
diff options
context:
space:
mode:
authorsjg <sjg@FreeBSD.org>2013-05-18 13:24:53 +0000
committersjg <sjg@FreeBSD.org>2013-05-18 13:24:53 +0000
commita636b85dc347ac3bd373e1851cf7a02c36fff15b (patch)
treeeca5741ddc0dd0ece62104f09f0b4763d28b4a4a /contrib/bmake
parente51b2aaaf82ffefd70425f775cc9a980489590e8 (diff)
downloadFreeBSD-src-a636b85dc347ac3bd373e1851cf7a02c36fff15b.zip
FreeBSD-src-a636b85dc347ac3bd373e1851cf7a02c36fff15b.tar.gz
Fix wildcard srcs for phony targets
Diffstat (limited to 'contrib/bmake')
-rw-r--r--contrib/bmake/suff.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/contrib/bmake/suff.c b/contrib/bmake/suff.c
index 6abdeb0..8a7a2e0 100644
--- a/contrib/bmake/suff.c
+++ b/contrib/bmake/suff.c
@@ -2058,6 +2058,10 @@ SuffFindNormalDeps(GNode *gn, Lst slst)
* children, then look for any overriding transformations they imply.
* Should we find one, we discard the one we found before.
*/
+ bottom = NULL;
+ targ = NULL;
+
+ if (!(gn->type & OP_PHONY)) {
while (ln != NULL) {
/*
@@ -2171,6 +2175,7 @@ SuffFindNormalDeps(GNode *gn, Lst slst)
for (targ = bottom; targ->parent != NULL; targ = targ->parent)
continue;
}
+ }
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(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)) {
fprintf(debug_file, "SuffFindDeps (%s)\n", gn->name);
}
OpenPOWER on IntegriCloud