[src/trunk]: src/usr.bin/make Add VAR_INTERNAL as a context for variables set...

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

details:   https://anonhg.NetBSD.org/src/rev/aa774ed30f0b
branches:  trunk
changeset: 789710:aa774ed30f0b
user:      sjg <sjg%NetBSD.org@localhost>
date:      Wed Sep 04 15:38:26 2013 +0000

description:
Add VAR_INTERNAL as a context for variables set by make itself,
which should not override those set by makefiles.
Currently MAKEFILE is the only variable affected.

Reviewed by: christos

diffstat:

 usr.bin/make/main.c |  10 +++++-----
 usr.bin/make/make.h |   6 +++++-
 usr.bin/make/var.c  |  15 ++++++++++++---
 3 files changed, 22 insertions(+), 9 deletions(-)

diffs (128 lines):

diff -r 79441d11696d -r aa774ed30f0b usr.bin/make/main.c
--- a/usr.bin/make/main.c       Wed Sep 04 13:03:22 2013 +0000
+++ b/usr.bin/make/main.c       Wed Sep 04 15:38:26 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: main.c,v 1.223 2013/08/04 16:48:15 sjg Exp $   */
+/*     $NetBSD: main.c,v 1.224 2013/09/04 15:38:26 sjg Exp $   */
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -69,7 +69,7 @@
  */
 
 #ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: main.c,v 1.223 2013/08/04 16:48:15 sjg Exp $";
+static char rcsid[] = "$NetBSD: main.c,v 1.224 2013/09/04 15:38:26 sjg Exp $";
 #else
 #include <sys/cdefs.h>
 #ifndef lint
@@ -81,7 +81,7 @@
 #if 0
 static char sccsid[] = "@(#)main.c     8.3 (Berkeley) 3/19/94";
 #else
-__RCSID("$NetBSD: main.c,v 1.223 2013/08/04 16:48:15 sjg Exp $");
+__RCSID("$NetBSD: main.c,v 1.224 2013/09/04 15:38:26 sjg Exp $");
 #endif
 #endif /* not lint */
 #endif
@@ -1384,7 +1384,7 @@
 
        if (!strcmp(fname, "-")) {
                Parse_File(NULL /*stdin*/, -1);
-               Var_Set("MAKEFILE", "", VAR_GLOBAL, 0);
+               Var_Set("MAKEFILE", "", VAR_INTERNAL, 0);
        } else {
                /* if we've chdir'd, rebuild the path name */
                if (strcmp(curdir, objdir) && *fname != '/') {
@@ -1433,7 +1433,7 @@
                 */
 found:
                if (!doing_depend)
-                       Var_Set("MAKEFILE", fname, VAR_GLOBAL, 0);
+                       Var_Set("MAKEFILE", fname, VAR_INTERNAL, 0);
                Parse_File(fname, fd);
        }
        free(path);
diff -r 79441d11696d -r aa774ed30f0b usr.bin/make/make.h
--- a/usr.bin/make/make.h       Wed Sep 04 13:03:22 2013 +0000
+++ b/usr.bin/make/make.h       Wed Sep 04 15:38:26 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: make.h,v 1.91 2013/06/18 20:06:09 sjg Exp $    */
+/*     $NetBSD: make.h,v 1.92 2013/09/04 15:38:26 sjg Exp $    */
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -388,6 +388,10 @@
 
 extern GNode    *DEFAULT;      /* .DEFAULT rule */
 
+extern GNode   *VAR_INTERNAL;  /* Variables defined internally by make
+                                * which should not override those set by
+                                * makefiles.
+                                */
 extern GNode    *VAR_GLOBAL;           /* Variables defined in a global context, e.g
                                 * in the Makefile itself */
 extern GNode    *VAR_CMD;      /* Variables defined on the command line */
diff -r 79441d11696d -r aa774ed30f0b usr.bin/make/var.c
--- a/usr.bin/make/var.c        Wed Sep 04 13:03:22 2013 +0000
+++ b/usr.bin/make/var.c        Wed Sep 04 15:38:26 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: var.c,v 1.183 2013/07/16 20:00:56 sjg Exp $    */
+/*     $NetBSD: var.c,v 1.184 2013/09/04 15:38:26 sjg Exp $    */
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -69,14 +69,14 @@
  */
 
 #ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: var.c,v 1.183 2013/07/16 20:00:56 sjg Exp $";
+static char rcsid[] = "$NetBSD: var.c,v 1.184 2013/09/04 15:38:26 sjg Exp $";
 #else
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)var.c      8.3 (Berkeley) 3/19/94";
 #else
-__RCSID("$NetBSD: var.c,v 1.183 2013/07/16 20:00:56 sjg Exp $");
+__RCSID("$NetBSD: var.c,v 1.184 2013/09/04 15:38:26 sjg Exp $");
 #endif
 #endif /* not lint */
 #endif
@@ -176,6 +176,7 @@
  * The four contexts are searched in the reverse order from which they are
  * listed.
  */
+GNode          *VAR_INTERNAL; /* variables from make itself */
 GNode          *VAR_GLOBAL;   /* variables from the makefile */
 GNode          *VAR_CMD;      /* variables defined on the command-line */
 
@@ -408,6 +409,10 @@
        (ctxt != VAR_GLOBAL))
     {
        var = Hash_FindEntry(&VAR_GLOBAL->context, name);
+       if ((var == NULL) && (ctxt != VAR_INTERNAL)) {
+           /* VAR_INTERNAL is subordinate to VAR_GLOBAL */
+           var = Hash_FindEntry(&VAR_INTERNAL->context, name);
+       }
     }
     if ((var == NULL) && (flags & FIND_ENV)) {
        char *env;
@@ -429,6 +434,9 @@
                   (ctxt != VAR_GLOBAL))
        {
            var = Hash_FindEntry(&VAR_GLOBAL->context, name);
+           if ((var == NULL) && (ctxt != VAR_INTERNAL)) {
+               var = Hash_FindEntry(&VAR_INTERNAL->context, name);
+           }
            if (var == NULL) {
                return NULL;
            } else {
@@ -4137,6 +4145,7 @@
 void
 Var_Init(void)
 {
+    VAR_INTERNAL = Targ_NewGN("Internal");
     VAR_GLOBAL = Targ_NewGN("Global");
     VAR_CMD = Targ_NewGN("Command");