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

Timestamp:

Mar 27, 2018, 4:05:17 PM (7 years ago)

Author:

bird

Message:

kmk/win: Windows kmk now defaults to --output-sync=target. Fixed output sync on windows in nested make processes that got busted by winchildren and it's no inheritance policy.

File:

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

trunk/src/kmk/main.c

@@ -478 +478 @@
   -O[TYPE], --output-sync[=TYPE]\n\
                               Synchronize output of parallel jobs by TYPE.\n"),
+#elif defined(KBUILD_OS_WINDOWS)
+    N_("\
+  -O[TYPE], --output-sync[=TYPE]\n\
+                              Synchronize output of parallel jobs by TYPE:\n\
+                                none    = no synchronization.\n\
+                                line    = receip line output\n\
+                                target  = entire receip output (default)\n\
+                                recurse = entire recursive invocation\n"),
 #else
     N_("\
@@ -730 +738 @@
    of each job stay together.  */
 
+#if defined(KMK) && defined(KBUILD_OS_WINDOWS)
+int output_sync = OUTPUT_SYNC_TARGET;
+#else
 int output_sync = OUTPUT_SYNC_NONE;
+#endif
 
 /* Nonzero if the "--trace" option was given.  */
@@ -1112 +1124 @@
    command-line argument.  */
 void
+# ifdef CONFIG_NEW_WIN_CHILDREN
+prepare_mutex_handle_string (const char *mtxname)
+{
+  if (!sync_mutex)
+    {
+      sync_mutex = xstrdup(mtxname);
+      define_makeflags (1, 0);
+    }
+}
+# else
 prepare_mutex_handle_string (sync_handle_t handle)
 {
@@ -1123 +1145 @@
     }
 }
+# endif
 
 #endif  /* NO_OUTPUT_SYNC */