Changeset 1948 in kBuild for trunk

Timestamp:

Oct 26, 2008 4:15:46 AM (16 years ago)

Author:

bird

Message:

kmk: Fixed CONFIG_WITH_LAZY_DEPS_VARS bug. Files with multiple double colon rules cannot be handled lazily in any easy way.

Location:

trunk/src/kmk

Files:

• commands.c (modified) (2 diffs)
• function.c (modified) (3 diffs)

trunk/src/kmk/commands.c

@@ -183 +183 @@
 #endif /* CONFIG_WITH_RDONLY_VARIABLE_VALUE */
 
-#ifndef CONFIG_WITH_LAZY_DEPS_VARS
   /* Compute the values for $^, $+, $?, and $|.  */
-
+#ifdef CONFIG_WITH_LAZY_DEPS_VARS
+  if (   file->double_colon
+      && (   file->double_colon != file
+          || file->last != file))
+#endif
   {
     static char *plus_value=0, *bar_value=0, *qmark_value=0;
@@ -325 +328 @@
     DEFINE_VARIABLE ("|", 1, bar_value);
   }
-
-#else  /* CONFIG_WITH_LAZY_DEPS_VARS */
-
-  /* Make a copy of the current dependency chain for later use in
-     potential $(dep-pluss $@) calls.  Then drop duplicate deps.  */
-
-  /* assert (file->org_deps == NULL); - FIXME? */
-  free_dep_chain (file->org_deps);
-  file->org_deps = copy_dep_chain (file->deps);
-
-  uniquize_deps (file->deps);
-
+#ifdef CONFIG_WITH_LAZY_DEPS_VARS
+  else
+    {
+      /* Make a copy of the current dependency chain for later use in
+         potential $(dep-pluss $@) calls.  Then drop duplicate deps.  */
+
+      /* assert (file->org_deps == NULL); - FIXME? */
+      free_dep_chain (file->org_deps);
+      file->org_deps = copy_dep_chain (file->deps);
+
+      uniquize_deps (file->deps);
+   }
 #endif /* CONFIG_WITH_LAZY_DEPS_VARS */
 #undef  DEFINE_VARIABLE

trunk/src/kmk/function.c

@@ -2302 +2302 @@
       struct dep *d;
 
+      if (   file->double_colon
+          && (   file->double_colon != file
+              || file->last != file))
+          error (NILF, _("$(%s ) cannot be used on files with multiple double colon rules like `%s'\n"),
+                 funcname, file->name);
+
       if (idx == 0 /* all */)
         {
@@ -2427 +2433 @@
       struct dep *d;
 
+      if (   file->double_colon
+          && (   file->double_colon != file
+              || file->last != file))
+          error (NILF, _("$(%s ) cannot be used on files with multiple double colon rules like `%s'\n"),
+                 funcname, file->name);
+
       if (idx == 0 /* all */)
         {
@@ -2551 +2563 @@
       struct dep *deps = file->deps;
       struct dep *d;
+
+      if (   file->double_colon
+          && (   file->double_colon != file
+              || file->last != file))
+          error (NILF, _("$(%s ) cannot be used on files with multiple double colon rules like `%s'\n"),
+                 funcname, file->name);
 
       if (idx == 0 /* all */)