From owner-svn-src-all@FreeBSD.ORG  Sat May 18 13:24:54 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 76858E54;
 Sat, 18 May 2013 13:24:54 +0000 (UTC) (envelope-from sjg@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 69539139;
 Sat, 18 May 2013 13:24:54 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4IDOs7E064614;
 Sat, 18 May 2013 13:24:54 GMT (envelope-from sjg@svn.freebsd.org)
Received: (from sjg@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4IDOs3P064613;
 Sat, 18 May 2013 13:24:54 GMT (envelope-from sjg@svn.freebsd.org)
Message-Id: <201305181324.r4IDOs3P064613@svn.freebsd.org>
From: "Simon J. Gerraty" <sjg@FreeBSD.org>
Date: Sat, 18 May 2013 13:24:54 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r250773 - head/contrib/bmake
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 18 May 2013 13:24:54 -0000

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);
     }