From f7f22db6030464f63eb942da04b3d5e10351f770 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Wed, 2 Nov 2022 09:56:31 +0200
Subject: More work on child process diagnostics buffering

---
 libbuild2/cc/link-rule.cxx | 19 +++----------------
 1 file changed, 3 insertions(+), 16 deletions(-)

(limited to 'libbuild2/cc/link-rule.cxx')

diff --git a/libbuild2/cc/link-rule.cxx b/libbuild2/cc/link-rule.cxx
index 5d212e6..ff03fd9 100644
--- a/libbuild2/cc/link-rule.cxx
+++ b/libbuild2/cc/link-rule.cxx
@@ -2970,7 +2970,7 @@ namespace build2
                 }
 
                 dbuf.read ();
-                dbuf.finish (args, pr, 2 /* verbosity */);
+                run_finish (dbuf, args, pr, 2 /* verbosity */);
               }
               catch (const process_error& e)
               {
@@ -4116,23 +4116,10 @@ namespace build2
 
         if (!ctx.dry_run)
         {
-#if 0
-          run (rl,
+          run (dbuf,
+               rl,
                args,
-               dir_path () /* cwd */,
                env_ptrs.empty () ? nullptr : env_ptrs.data ());
-#else
-          process pr (rl,
-                      args,
-                      0                   /* stdin  */,
-                      1                   /* stdout */,
-                      dbuf.open (args[0]) /* stderr */,
-                      nullptr             /* cwd    */,
-                      env_ptrs.empty () ? nullptr : env_ptrs.data ());
-
-          dbuf.read ();
-          dbuf.finish (args, pr);
-#endif
         }
       }
 
-- 
cgit v1.1