Changeset 2717 in kBuild for trunk/src/kmk/read.c

Timestamp:

Dec 30, 2013 12:58:43 AM (11 years ago)

Author:

bird

Message:

kmk: Hacking kBuild-define-*.

File:

• trunk/src/kmk/read.c (modified) (2 diffs)

trunk/src/kmk/read.c

@@ -961 +961 @@
 #ifdef KMK
       /* Check for the kBuild language extensions. */
-      if (   wlen >= sizeof("kBuild-define") - 1
-          && strneq (p, "kBuild-define", sizeof("kBuild-define") - 1))
-        krc = eval_kbuild_define (&kdata, fstart, p, wlen, p2, eol, ignoring);
-      else if (   wlen >= sizeof("kBuild-endef") - 1
-               && strneq (p, "kBuild-endef", sizeof("kBuild-endef") - 1))
-        krc = eval_kbuild_endef (&kdata, fstart, p, wlen, p2, eol, ignoring);
-      else
-        krc = 42;
-      if (krc != 42)
+      if (   wlen > sizeof("kBuild-")
+          && strneq (p, "kBuild-", sizeof("kBuild-") - 1))
         {
-          if (krc != 0)
-            error (fstart, _("krc=%d"), krc);
-          continue;
+          krc = eval_kbuild_read_hook (&kdata, fstart, p, wlen, p2, eol, ignoring);
+          if (krc != 42)
+            {
+              if (krc != 0)
+                error (fstart, _("krc=%d"), krc);
+              continue;
+            }
         }
-
 #endif /* KMK */
 
@@ -1852 +1848 @@
     definition[idx - 1] = '\0';
 
+#ifndef CONFIG_WITH_VALUE_LENGTH
   v = do_variable_definition (&defstart, name, definition, origin, flavor, 0);
+#else
+  v = do_variable_definition_2 (&defstart, name, definition,
+                                idx ? idx - 1 : idx,  flavor == f_simple,
+                                0 /* free_value */, origin, flavor,
+                                0 /*target_var*/);
+#endif
   free (definition);
   free (var);