Changeset 2664 in kBuild

Timestamp:

Nov 9, 2012 11:14:45 PM (12 years ago)

Author:

bird

Message:

commands.c: Fixed bad merge, causing crashes in memcpy (bp, c, len); in set_file_variables().

File:

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

trunk/src/kmk/commands.c

@@ -341 +341 @@
     bar_len = 0;
     for (d = file->deps; d != 0; d = d->next)
-      if (! d->ignore_mtime)
       {
         if (!d->need_2nd_expansion)
           {
+            if (d->ignore_mtime)
 #ifndef CONFIG_WITH_STRCACHE2
-            if (d->ignore_mtime)
               bar_len += strlen (dep_name (d)) + 1;
+#else
+              bar_len += strcache2_get_len (&file_strcache, dep_name (d)) + 1;
+#endif
             else
+#ifndef CONFIG_WITH_STRCACHE2
               plus_len += strlen (dep_name (d)) + 1;
 #else
-            if (d->ignore_mtime)
-              bar_len += strcache2_get_len (&file_strcache, dep_name (d)) + 1;
-            else
               plus_len += strcache2_get_len (&file_strcache, dep_name (d)) + 1;
 #endif