svn commit: r186558 - head/usr.bin/make

David E. O'Brien obrien at FreeBSD.org
Mon Dec 29 08:05:50 UTC 2008


Author: obrien
Date: Mon Dec 29 08:05:49 2008
New Revision: 186558
URL: http://svn.freebsd.org/changeset/base/186558

Log:
  Consistently use Var_SetGlobal().

Modified:
  head/usr.bin/make/for.c
  head/usr.bin/make/parse.c
  head/usr.bin/make/suff.c

Modified: head/usr.bin/make/for.c
==============================================================================
--- head/usr.bin/make/for.c	Mon Dec 29 06:31:03 2008	(r186557)
+++ head/usr.bin/make/for.c	Mon Dec 29 08:05:49 2008	(r186558)
@@ -254,7 +254,7 @@ For_Run(int lineno)
 
 	LST_FOREACH(ln, &values) {
 		val = Lst_Datum(ln);
-		Var_Set(var, val, VAR_GLOBAL);
+		Var_SetGlobal(var, val);
 
 		DEBUGF(FOR, ("--- %s = %s\n", var, val));
 		str = Buf_Peel(Var_SubstOnly(var, Buf_Data(buf), FALSE));

Modified: head/usr.bin/make/parse.c
==============================================================================
--- head/usr.bin/make/parse.c	Mon Dec 29 06:31:03 2008	(r186557)
+++ head/usr.bin/make/parse.c	Mon Dec 29 08:05:49 2008	(r186558)
@@ -1076,7 +1076,7 @@ ParseDoDependency(char *line)
 			break;
 		  case Posix:
 			is_posix = TRUE;
-			Var_Set("%POSIX", "1003.2", VAR_GLOBAL);
+			Var_SetGlobal("%POSIX", "1003.2");
 			break;
 		  default:
 			break;

Modified: head/usr.bin/make/suff.c
==============================================================================
--- head/usr.bin/make/suff.c	Mon Dec 29 06:31:03 2008	(r186557)
+++ head/usr.bin/make/suff.c	Mon Dec 29 08:05:49 2008	(r186558)
@@ -785,11 +785,11 @@ Suff_DoPaths(void)
 	}
 
 	ptr = Path_MakeFlags("-I", &inIncludes);
-	Var_Set(".INCLUDES", ptr, VAR_GLOBAL);
+	Var_SetGlobal(".INCLUDES", ptr);
 	free(ptr);
 
 	ptr = Path_MakeFlags("-L", &inLibs);
-	Var_Set(".LIBS", ptr, VAR_GLOBAL);
+	Var_SetGlobal(".LIBS", ptr);
 	free(ptr);
 
 	Path_Clear(&inIncludes);


More information about the svn-src-all mailing list