[src/trunk]: src/usr.bin/make Make .INVISIBLE nodes be ignored by suffix tran...

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/fc957170a965
branches:  trunk
changeset: 801999:fc957170a965
user:      christos <christos%NetBSD.org@localhost>
date:      Wed Aug 27 08:50:38 2014 +0000

description:
Make .INVISIBLE nodes be ignored by suffix transformations.

diffstat:

 usr.bin/make/suff.c |  25 ++++++++++++++-----------
 1 files changed, 14 insertions(+), 11 deletions(-)

diffs (73 lines):

diff -r 13ae3ddec2f1 -r fc957170a965 usr.bin/make/suff.c
--- a/usr.bin/make/suff.c       Wed Aug 27 04:30:25 2014 +0000
+++ b/usr.bin/make/suff.c       Wed Aug 27 08:50:38 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: suff.c,v 1.71 2014/08/23 15:05:40 christos Exp $       */
+/*     $NetBSD: suff.c,v 1.72 2014/08/27 08:50:38 christos Exp $       */
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -69,14 +69,14 @@
  */
 
 #ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: suff.c,v 1.71 2014/08/23 15:05:40 christos Exp $";
+static char rcsid[] = "$NetBSD: suff.c,v 1.72 2014/08/27 08:50:38 christos Exp $";
 #else
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)suff.c     8.4 (Berkeley) 3/21/94";
 #else
-__RCSID("$NetBSD: suff.c,v 1.71 2014/08/23 15:05:40 christos Exp $");
+__RCSID("$NetBSD: suff.c,v 1.72 2014/08/27 08:50:38 christos Exp $");
 #endif
 #endif /* not lint */
 #endif
@@ -1712,7 +1712,7 @@
 SuffFindThem(Lst possible, Lst cleanup)
 {
     Src        *i, *result, *parent;
-    char *temp;
+    char *tf;
 
     result = NULL;
     /*
@@ -1734,6 +1734,7 @@
      * possibilities are exhausted.
      */
     while ((i = (Src *)Lst_DeQueue(possible)) != NULL) {
+       GNode *n;
        if (parent != i->parent) {
            SuffDebugChain(i->parent);
            parent = i->parent;
@@ -1744,20 +1745,22 @@
         * XXX: should only targets with commands be accepted?  The node
         * exists even if it only has had extra dependencies added.
         */
-       if (Targ_FindNode(i->file, TARG_NOCREATE) != NULL) {
+       if ((n = Targ_FindNode(i->file, TARG_NOCREATE)) != NULL) {
 #ifdef DEBUG_SRC
            fprintf(debug_file, "remove %x from %x\n", i, possible);
 #endif
-           result = i;
-           break;
-       }
-
-       if ((temp = Dir_FindFile(i->file, i->suff->searchPath)) != NULL) {
+           SuffDebug(": Node %s %x: ", i->file, n->type);
+           if ((n->type & OP_INVISIBLE) == 0) {
+               result = i;
+               break;
+           }
+       } else if ((tf = Dir_FindFile(i->file, i->suff->searchPath)) != NULL) {
            result = i;
 #ifdef DEBUG_SRC
            fprintf(debug_file, "remove %x from %x\n", i, possible);
 #endif
-           free(temp);
+           SuffDebug(": File %s %s: ", i->file, tf);
+           free(tf);
            break;
        }