Changeset 3561 in kBuild for trunk

Timestamp:

Mar 8, 2022 10:01:30 AM (3 years ago)

Author:

bird

Message:

kmk: build fixes

File:

• trunk/src/kmk/function.c (modified) (14 diffs)

trunk/src/kmk/function.c

@@ -82 +82 @@
 #endif /* CONFIG_WITH_OS2_LIBPATH */
 
-#ifdef KMK
+#if defined(KMK) || defined(CONFIG_WITH_LAZY_DEPS_VARS)
 /** Checks if the @a_cch characters (bytes) in @a a_psz equals @a a_szConst. */
 # define STR_N_EQUALS(a_psz, a_cch, a_szConst) \
     ( (a_cch) == sizeof (a_szConst) - 1 && !strncmp ((a_psz), (a_szConst), sizeof (a_szConst) - 1) )
-
+#endif
+
+#ifdef KMK
 # ifdef _MSC_VER
 #  include "kmkbuiltin/mscfakes.h"
@@ -5404 +5406 @@
 }
 
+#endif /* KMK */
+#if defined (KMK) || defined (CONFIG_WITH_LAZY_DEPS_VARS)
+
 /* Helper for performer GNU make style quoting of one filename. */
 
@@ -5489 +5494 @@
 }
 
+# ifdef KMK
+
 /* Helper for func_quote_make that checks if there are more arguments
    that produces output or not. */
@@ -5562 +5569 @@
   return o;
 }
+
+# endif /* KMK */
 
 /* Worker for func_quote_shell() for escaping a string that's inside
@@ -5596 +5605 @@
 }
 
+# ifdef KMK
 /* quote-sh-dq */
 
@@ -5602 +5612 @@
   return func_escape_shell_in_dq (o, argv[0], strlen (argv[0]));
 }
-
+# endif
 
 /* Worker for func_quote_shell() for escaping a string that's inside
@@ -5626 +5636 @@
 }
 
+# ifdef KMK
 /* quote-sh-dq */
 
@@ -5632 +5643 @@
   return func_escape_shell_in_sq (o, argv[0], strlen (argv[0]));
 }
+#endif
 
 /* Output a shell argument with quoting as needed. */
@@ -5680 +5692 @@
 }
 
+# ifdef KMK
+
 /* Takes zero or more plain strings and escapes/quotes spaces and other
    problematic characters, bourne make style.
@@ -5726 +5740 @@
     }
 }
+
+# endif /* KMK */
 
 /* Decoded style options for the $(q* ) and $(*file* ) functions. */
@@ -5764 +5780 @@
 #endif
 
-
+# ifdef KMK
 /* Decodes the optional style argument.  This is chiefly for the return
    style, but can also pick the input and space styles (just because we can).  */
@@ -5849 +5865 @@
   return intstyle;
 }
+# endif /* KMK */
 
 /* Output (returns) a separator according to STYLE. */
@@ -5948 +5965 @@
 }
 
+#endif /* KMK || CONFIG_WITH_LAZY_DEPS_VARS */
+#ifdef KMK
+
 /* Outputs (returns) the given CHAIN and frees it. */
 
@@ -7086 +7106 @@
         {
           if (pp->percent)
-            for (wp = wordhead; wp != 0; wp = wp->next)
-              if (!wp->matched
-                  && pattern_matches_ex (pp->str, pp->percent, pp->sfxlen,
-                                         wp->str, wp->length))
-                {
-                  wp->matched = 1;
-                  if (is_filter)
-                    words_len += wp->length + 1;
-                  else
-                    words_len -= wp->length + 1;
-                }
+            {
+              for (wp = wordhead; wp != 0; wp = wp->next)
+                if (!wp->matched
+                    && pattern_matches_ex (pp->str, pp->percent, pp->sfxlen,
+                                           wp->str, wp->length))
+                  {
+                    wp->matched = 1;
+                    if (is_filter)
+                      words_len += wp->length + 1;
+                    else
+                      words_len -= wp->length + 1;
+                  }
+            }
           else if (hashing)
             {