Author: sjg
Date: Sat May 18 13:24:53 2013
New Revision: 250773
URL: http://svnweb.freebsd.org/changeset/base/250773
Log:
Fix wildcard srcs for phony targets
Modified:
head/contrib/bmake/suff.c
Modified: head/contrib/bmake/suff.c
==============================================================================
--- head/contrib/bmake/suff.c Sat May 18 13:19:31 2013 (r250772)
+++ head/contrib/bmake/suff.c Sat May 18 13:24:53 2013 (r250773)
@@ -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);
}
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
