Changeset 2742 in kBuild for trunk/src

Timestamp:

Dec 26, 2014 4:36:58 PM (10 years ago)

Author:

bird

Message:

remake.c: Some check_rename and rename related fixes to update_file_1.

File:

• trunk/src/kmk/remake.c (modified) (3 diffs)

trunk/src/kmk/remake.c

@@ -465 +465 @@
   int running = 0;
 #ifdef CONFIG_WITH_EXPLICIT_MULTITARGET
-  struct file *req_file = file;
-  struct file *org_file = file;
+  struct file *org_file;
+  struct file *req_file;
   struct file *f2, *f3;
 
-  /* Always work on the primary multi target file. */
-
-  if (file->multi_head != NULL && file->multi_head != file)
-    {
-      DBS (DB_VERBOSE, (_("Considering target file `%s' -> multi head `%s'.\n"),
-                          file->name, file->multi_head->name));
-      org_file = file = file->multi_head;
+  /* Secondary target expansion leaves renamed files around, skip any rename
+     files to simplify multi target handling. */
+
+  check_renamed(file);
+
+  /* Remember the request file and find the primary multi target file. Always
+     work on the primary file in a multi target recipe.  */
+
+  req_file = file;
+  org_file = file;
+  if (file->multi_head != NULL)
+    {
+      if (file->multi_head == file)
+        DBS (DB_VERBOSE, (_("Considering target file `%s'  (multi head).\n"), file->name));
+      else
+        {
+          org_file = file = file->multi_head;
+          DBS (DB_VERBOSE, (_("Considering target file `%s' -> multi head `%s'.\n"),
+                              req_file->name, file->name));
+          assert (file->multi_head == file);
+        }
     }
   else
@@ -541 +555 @@
 #ifdef CONFIG_WITH_EXPLICIT_MULTITARGET
   this_mtime = file_mtime (file);
+  check_renamed (file);
   f3 = file;
   for (f2 = file->multi_next;
@@ -564 +579 @@
         break;
       }
-  check_renamed (file);
+  check_renamed (f3);
   noexist = this_mtime == NONEXISTENT_MTIME;
   if (noexist)