Changeset 1622 in kBuild

Timestamp:

May 12, 2008 9:28:54 PM (17 years ago)

Author:

bird

Message:

Bumped up the priority of a local variable. Fixed inconsistent use of local variables in kbuild.c.

Location:

trunk/src/kmk

Files:

• kbuild.c (modified) (6 diffs)
• variable.h (modified) (1 diff)

trunk/src/kmk/kbuild.c

@@ -723 +723 @@
             *pszEnd = '\0';
             pVar = define_variable_vl(pszVarName, strlen(pszVarName), psz, pszEnd - psz,
-                                      1 /* duplicate */, o_file, 0 /* !recursive */);
+                                      1 /* duplicate */, o_local, 0 /* !recursive */);
             *pszEnd = chSaved;
             if (pVar)
@@ -981 +981 @@
      */
     return define_variable_vl(pszVarName, strlen(pszVarName), pszResult, cch - 1,
-                              0 /* use pszResult */, o_file, 0 /* !recursive */);
+                              0 /* use pszResult */, o_local, 0 /* !recursive */);
 }
 
@@ -1507 +1507 @@
 
     pVar = define_variable_vl(pszVarName, strlen(pszVarName), pszResult, cchTotal,
-                              0 /* take pszResult */ , o_file, 0 /* !recursive */);
+                              0 /* take pszResult */ , o_local, 0 /* !recursive */);
     return pVar;
 }
@@ -1582 +1582 @@
     memcpy(psz, pObjSuff->value, pObjSuff->value_length);   psz += pObjSuff->value_length;
     memcpy(psz, pDepSuff->value, pDepSuff->value_length + 1);
-    *ppDep = define_variable_vl("dep", 3, pszResult, cch - 1, 1 /*dup*/, o_file, 0 /* !recursive */);
+    *ppDep = define_variable_vl("dep", 3, pszResult, cch - 1, 1 /*dup*/, o_local, 0 /* !recursive */);
 
     /*
@@ -1589 +1589 @@
     *psz = '\0';
     pObj = define_variable_vl(pszVarName, strlen(pszVarName), pszResult, psz - pszResult,
-                              1/* dup */, o_file, 0 /* !recursive */);
+                              1/* dup */, o_local, 0 /* !recursive */);
 
     /*
@@ -1654 +1654 @@
         *psz = '\0';
     }
-    *ppDirDep = define_variable_vl("dirdep", 6, pszResult, psz - pszResult, 1/*dup*/, o_file, 0 /* !recursive */);
+    *ppDirDep = define_variable_vl("dirdep", 6, pszResult, psz - pszResult, 1/*dup*/, o_local, 0 /* !recursive */);
 
     return pObj;

trunk/src/kmk/variable.h

@@ -25 +25 @@
     o_default,          /* Variable from the default set.  */
     o_env,              /* Variable from environment.  */
-#ifdef CONFIG_WITH_LOCAL_VARIABLES /** @todo Correct priority? */
-    o_local,            /* Variable from an 'local' directive.  */
-#endif
     o_file,             /* Variable given in a makefile.  */
     o_env_override,     /* Variable from environment, if -e.  */
     o_command,          /* Variable given by user.  */
     o_override,         /* Variable from an `override' directive.  */
+#ifdef CONFIG_WITH_LOCAL_VARIABLES
+    o_local,            /* Variable from an 'local' directive.  */
+#endif
     o_automatic,        /* Automatic variable -- cannot be set.  */
     o_invalid           /* Core dump time.  */