Changeset 1751 in kBuild

Timestamp:

Sep 6, 2008 2:58:38 AM (16 years ago)

Author:

bird

Message:

kmk: Don't bother with secondary target expansion if it's not enabled (you can't turn it off when it's on). In the KMK case we force undefined variable warnings during scondary target expansion because bad stuff may happen if you get this wrong (like file in the root).

File:

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

trunk/src/kmk/file.c

@@ -678 +678 @@
      be re-inserting (delete+insert) hash table entries so we have to use
      hash_dump(). */
-  file_slot_0 = (struct file **) hash_dump (&files, 0, 0);
-  file_end = file_slot_0 + files.ht_fill;
-  for (file_slot = file_slot_0; file_slot < file_end; file_slot++)
-    for (f = *file_slot; f != 0; f = f->prev)
-      if (f->need_2nd_target_expansion)
-        do_2nd_target_expansion (f);
-  free (file_slot_0);
-
-  /* Disable second target expansion now since we won't expand files
-     entered after this point. (saves CPU cycles in enter_file()). */
-  second_target_expansion = 0;
+  if (second_target_expansion)
+    {
+# ifdef KMK /* turn on warnings here. */
+      int save = warn_undefined_variables_flag;
+      warn_undefined_variables_flag = 1;
+# endif
+
+      file_slot_0 = (struct file **) hash_dump (&files, 0, 0);
+      file_end = file_slot_0 + files.ht_fill;
+      for (file_slot = file_slot_0; file_slot < file_end; file_slot++)
+        for (f = *file_slot; f != 0; f = f->prev)
+          if (f->need_2nd_target_expansion)
+            do_2nd_target_expansion (f);
+      free (file_slot_0);
+
+# ifdef KMK
+      warn_undefined_variables_flag = save;
+# endif 
+    
+      /* Disable second target expansion now since we won't expand files
+         entered after this point. (saves CPU cycles in enter_file()). */
+      second_target_expansion = 0;
+    }
 #endif /* CONFIG_WITH_2ND_TARGET_EXPANSION */