Changeset 917 for trunk/src/gmakenew/variable.c

Timestamp:

May 25, 2007, 12:39:22 AM (18 years ago)

Author:

bird

Message:

PATH_KBUILD and PATH_KBUILD_BIN improvements. Avoid LOCALEDIR, ALIASDIR, LIBDIR and INCLUDEDIR.

File:

• trunk/src/gmakenew/variable.c (modified) (3 diffs)

trunk/src/gmakenew/variable.c

@@ -31 +31 @@
 #endif
 #include "hash.h"
+#ifdef KMK
+# include "kbuild.h"
+#endif
 
 /* Chain of all pattern-specific variables.  */
@@ -990 +993 @@
   /* Define KBUILD_VERSION* */
   sprintf (buf, "%d", KBUILD_VERSION_MAJOR);
-  (void) define_variable ("KBUILD_VERSION_MAJOR", sizeof("KBUILD_VERSION_MAJOR") - 1,
-                          buf, o_default, 0);
+  define_variable ("KBUILD_VERSION_MAJOR", sizeof ("KBUILD_VERSION_MAJOR") - 1,
+                   buf, o_default, 0);
   sprintf (buf, "%d", KBUILD_VERSION_MINOR);
-  (void) define_variable ("KBUILD_VERSION_MINOR", sizeof("KBUILD_VERSION_MINOR") - 1,
-                          buf, o_default, 0);
+  define_variable ("KBUILD_VERSION_MINOR", sizeof("KBUILD_VERSION_MINOR") - 1,
+                   buf, o_default, 0);
   sprintf (buf, "%d", KBUILD_VERSION_PATCH);
-  (void) define_variable ("KBUILD_VERSION_PATCH", sizeof("KBUILD_VERSION_PATCH") - 1,
-                          buf, o_default, 0);
+  define_variable ("KBUILD_VERSION_PATCH", sizeof ("KBUILD_VERSION_PATCH") - 1,
+                   buf, o_default, 0);
 
   sprintf (buf, "%d.%d.%d", KBUILD_VERSION_MAJOR, KBUILD_VERSION_MINOR, KBUILD_VERSION_PATCH);
-  (void) define_variable ("KBUILD_VERSION", sizeof("KBUILD_VERSION") - 1,
-                          buf, o_default, 0);
+  define_variable ("KBUILD_VERSION", sizeof ("KBUILD_VERSION") - 1,
+                   buf, o_default, 0);
 
   /* The build platform defaults. */
   envvar = getenv ("BUILD_PLATFORM");
   if (!envvar)
-      (void) define_variable ("BUILD_PLATFORM", sizeof("BUILD_PLATFORM") - 1,
-                              BUILD_PLATFORM, o_default, 0);
+      define_variable ("BUILD_PLATFORM", sizeof ("BUILD_PLATFORM") - 1,
+                       BUILD_PLATFORM, o_default, 0);
   envvar = getenv ("BUILD_PLATFORM_ARCH");
   if (!envvar)
-      (void) define_variable ("BUILD_PLATFORM_ARCH", sizeof("BUILD_PLATFORM_ARCH") - 1,
-                              BUILD_PLATFORM_ARCH, o_default, 0);
+      define_variable ("BUILD_PLATFORM_ARCH", sizeof ("BUILD_PLATFORM_ARCH") - 1,
+                       BUILD_PLATFORM_ARCH, o_default, 0);
   envvar = getenv ("BUILD_PLATFORM_CPU");
   if (!envvar)
-      (void) define_variable ("BUILD_PLATFORM_CPU", sizeof("BUILD_PLATFORM_CPU") - 1,
-                              BUILD_PLATFORM_CPU, o_default, 0);
-
-# ifdef PATH_KBUILD
-  /* define the installed. */
-  envvar = getenv("PATH_KBUILD");
-  if (!envvar)
-  {
-      (void) define_variable ("PATH_KBUILD", sizeof("PATH_KBUILD") - 1,
-                              PATH_KBUILD, o_default, 0);
-      envvar = getenv("PATH_KBUILD_BIN");
-      if (!envvar)
-          (void) define_variable ("PATH_KBUILD_BIN", sizeof("PATH_KBUILD_BIN") - 1,
-                                  PATH_KBUILD_BIN, o_default, 0);
-  }
-# endif
-
+      define_variable ("BUILD_PLATFORM_CPU", sizeof ("BUILD_PLATFORM_CPU") - 1,
+                       BUILD_PLATFORM_CPU, o_default, 0);
+
+  /* The kBuild locations. */
+  define_variable ("PATH_KBUILD", sizeof ("PATH_KBUILD") - 1,
+                   get_path_kbuild (), o_default, 0);
+  define_variable ("PATH_KBUILD_BIN", sizeof ("PATH_KBUILD_BIN") - 1,
+                   get_path_kbuild_bin (), o_default, 0);
 
   /* Define KMK_FEATURES to indicate various working KMK features. */
@@ -1053 +1047 @@
                           , o_default, 0);
 # else /* MSC can't deal with strings mixed with #if/#endif, thus the slow way. */
-  strcpy(buf, "append-dash-n abspath");
-#  if defined(CONFIG_WITH_RSORT)
-  strcat(buf, " rsort");
+  strcpy (buf, "append-dash-n abspath");
+#  if defined (CONFIG_WITH_RSORT)
+  strcat (buf, " rsort");
 #  endif
-#  if defined(CONFIG_WITH_ABSPATHEX)
-  strcat(buf, " abspathex");
+#  if defined (CONFIG_WITH_ABSPATHEX)
+  strcat (buf, " abspathex");
 #  endif
-#  if defined(CONFIG_WITH_TOUPPER_TOLOWER)
-  strcat(buf, " toupper tolower");
+#  if defined (CONFIG_WITH_TOUPPER_TOLOWER)
+  strcat (buf, " toupper tolower");
 #  endif
-#  if defined(CONFIG_WITH_VALUE_LENGTH) && defined(CONFIG_WITH_COMPARE)
-  strcat(buf, " comp-vars comp-cmds");
+#  if defined (CONFIG_WITH_VALUE_LENGTH) && defined(CONFIG_WITH_COMPARE)
+  strcat (buf, " comp-vars comp-cmds");
 #  endif
-#  if defined(CONFIG_WITH_STACK)
-  strcat(buf, " stack");
+#  if defined (CONFIG_WITH_STACK)
+  strcat (buf, " stack");
 #  endif
-#  if defined(CONFIG_WITH_MATH)
-  strcat(buf, " math-int");
+#  if defined (CONFIG_WITH_MATH)
+  strcat (buf, " math-int");
 #  endif
-#  if defined(CONFIG_WITH_XARGS)
-  strcat(buf, " xargs");
+#  if defined (CONFIG_WITH_XARGS)
+  strcat (buf, " xargs");
 #  endif
 #  ifdef KMK_HELPERS
-  strcat(buf, " kb-src-tool kb-obj-base kb-obj-suff kb-src-prop kb-src-one");
+  strcat (buf, " kb-src-tool kb-obj-base kb-obj-suff kb-src-prop kb-src-one");
 #  endif
   (void) define_variable ("KMK_FEATURES", 12, buf, o_default, 0);