Changeset 1915 for trunk/src/kmk/main.c

Timestamp:

Oct 22, 2008, 11:59:51 PM (17 years ago)

Author:

bird

Message:

kmk: CONFIG_WITH_MINIMAL_STATS vs. CONFIG_WITH_MAKE_STATS - require special builds for expensive statistics.

File:

• trunk/src/kmk/main.c (modified) (6 diffs)

trunk/src/kmk/main.c

@@ -329 +329 @@
 #endif /* KMK */
 
-#ifdef CONFIG_WITH_MAKE_STATS
+#if defined (CONFIG_WITH_MAKE_STATS) || defined (CONFIG_WITH_MINIMAL_STATS)
 /* When set, we'll gather expensive statistics like for the heap. */
 
@@ -489 +489 @@
     { 'S', flag_off, &keep_going_flag, 1, 1, 0, 0, &default_keep_going_flag,
       "no-keep-going" },
-#ifdef KMK
+#if defined (CONFIG_WITH_MAKE_STATS) || defined (CONFIG_WITH_MINIMAL_STATS)
     { CHAR_MAX+14, flag, (char *) &make_expensive_statistics, 1, 1, 1, 0, 0,
        "statistics" },
@@ -829 +829 @@
   errno = 0;
   if (nice (nice_level) == -1 && errno != 0)
-    fprintf (stderr, "warning: nice (%d) failed: %s\n", nice, strerror (errno));
+    fprintf (stderr, "warning: nice (%d) failed: %s\n",
+             nice_level, strerror (errno));
 #endif
 }
@@ -1840 +1841 @@
     {
       struct stat st;
-      if ((   stat ("Makefile.kup", &st) == 0
-           && S_ISREG (st.st_mode) )
-       || (   stat ("makefile.kup", &st) == 0
-           && S_ISREG (st.st_mode) )
+      if ((   (   stat ("Makefile.kup", &st) == 0
+               && S_ISREG (st.st_mode) )
+           || (   stat ("makefile.kup", &st) == 0
+               && S_ISREG (st.st_mode) ) )
        && stat ("Makefile.kmk", &st) < 0
        && stat ("makefile.kmk", &st) < 0)
@@ -3531 +3532 @@
     define_variable ("KMK_OPTS_AFFINITY", sizeof("KMK_OPTS_AFFINITY") - 1,
                      val, o_default, 1);
+#if defined (CONFIG_WITH_MAKE_STATS) || defined (CONFIG_WITH_MINIMAL_STATS)
     define_variable ("KMK_OPTS_STATISTICS", sizeof("KMK_OPTS_STATISTICS") - 1,
                      make_expensive_statistics ? "1" : "0", o_default, 1);
+# endif
   }
 #endif
@@ -3604 +3607 @@
   if (!remote_description || *remote_description == '\0')
     printf (_("\n%sThis program is built for %s/%s/%s [" __DATE__ " " __TIME__ "]\n"),
-            precede, KBUILD_HOST, KBUILD_HOST_ARCH, KBUILD_HOST_CPU, remote_description);
+            precede, KBUILD_HOST, KBUILD_HOST_ARCH, KBUILD_HOST_CPU);
   else
     printf (_("\n%sThis program is built for %s/%s/%s (%s) [" __DATE__ " " __TIME__ "]\n"),