Changeset 1518 in kBuild

Timestamp:

Apr 10, 2008 11:40:13 PM (17 years ago)

Author:

bird

Message:

MSC doesn't grok #ifdefs inside macros invocations.

File:

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

trunk/src/kmk/main.c

@@ -1650 +1650 @@
 #ifdef KMK
       (void) define_variable ("KMK_OVERRIDES", 13,
+                              "${-*-command-variables-*-}", o_env, 1);
 #else
       (void) define_variable ("MAKEOVERRIDES", 13,
-#endif
                               "${-*-command-variables-*-}", o_env, 1);
+#endif
     }
 
@@ -3308 +3309 @@
 #ifdef KMK
   v = define_variable ("KMK_FLAGS", 9,
+                       /* If there are switches, omit the leading dash
+                          unless it is a single long option with two
+                          leading dashes.  */
+                       &flagstring[(flagstring[0] == '-'
+                                    && flagstring[1] != '-')
+                                   ? 1 : 0],
+                       /* This used to use o_env, but that lost when a
+                          makefile defined MAKEFLAGS.  Makefiles set
+                          MAKEFLAGS to add switches, but we still want
+                          to redefine its value with the full set of
+                          switches.  Of course, an override or command
+                          definition will still take precedence.  */
+                       o_file, 1);
 #else
   v = define_variable ("MAKEFLAGS", 9,
-#endif
                        /* If there are switches, omit the leading dash
                           unless it is a single long option with two
@@ -3324 +3337 @@
                           definition will still take precedence.  */
                        o_file, 1);
+#endif
   if (! all)
     /* The first time we are called, set MAKEFLAGS to always be exported.