From 48e2e4140b8e5aacdfd107a1215f21c9632c81c8 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Mon, 22 Aug 2016 12:55:21 +0200
Subject: Cache process_path, use fallback search directory for binutils

---
 build2/utility.txx | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'build2/utility.txx')

diff --git a/build2/utility.txx b/build2/utility.txx
index 3e29db6..7256547 100644
--- a/build2/utility.txx
+++ b/build2/utility.txx
@@ -6,13 +6,14 @@ namespace build2
 {
   template <typename T>
   T
-  run (const char* args[],
+  run (const process_path& pp,
+       const char* args[],
        T (*f) (string&),
        bool err,
        bool ignore_exit,
        sha256* checksum)
   {
-    process pr (start_run (args, err));
+    process pr (run_start (pp, args, err));
 
     T r;
     string l; // Last line of output.
@@ -35,10 +36,10 @@ namespace build2
     }
     catch (const ifdstream::failure&)
     {
-      // Presumably the child process failed. Let finish_run() deal with that.
+      // Presumably the child process failed. Let run_finish() deal with that.
     }
 
-    if (!(finish_run (args, err, pr, l) || ignore_exit))
+    if (!(run_finish (args, err, pr, l) || ignore_exit))
       r = T ();
 
     return r;
-- 
cgit v1.1