Changeset 1951 in kBuild

Timestamp:

Oct 26, 2008 5:44:28 AM (16 years ago)

Author:

bird

Message:

commands.c: Fixed CONFIG_WITH_LAZY_DEPS_VARS regression wrt. to rehash'ed file, i.e. VPATH.

File:

• trunk/src/kmk/commands.c (modified) (1 diff)

trunk/src/kmk/commands.c

@@ -185 +185 @@
   /* Compute the values for $^, $+, $?, and $|.  */
 #ifdef CONFIG_WITH_LAZY_DEPS_VARS
-  if (   file->double_colon
-      && (   file->double_colon != file
-          || file->last != file))
+  /* Lazy doesn't work for double colon rules with multiple files with
+     commands, nor for files that has been thru rehash_file() (vpath).  */
+  if (   (   file->double_colon
+          && (   file->double_colon != file
+             || file->last != file))
+      || file->name != file->hname) /* XXX: Rehashed files should be fixable! */
 #endif
   {