From 66de0d06e5b6c002cbc7d18e18685e3ea44d3848 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Wed, 9 Oct 2019 12:08:45 +0200
Subject: Prepend pattern search paths to PATH when running binutils

This way any dependent tools (such as mt.exe that is invoked by link.exe)
are first search for in there.
---
 libbuild2/utility.hxx | 34 +++++++++++++++++++---------------
 1 file changed, 19 insertions(+), 15 deletions(-)

(limited to 'libbuild2/utility.hxx')

diff --git a/libbuild2/utility.hxx b/libbuild2/utility.hxx
index c362b34..980c31f 100644
--- a/libbuild2/utility.hxx
+++ b/libbuild2/utility.hxx
@@ -280,18 +280,20 @@ namespace build2
   inline void
   run (const process_path& p,
        const char* args[],
-       const dir_path& cwd = dir_path ())
+       const dir_path& cwd = dir_path (),
+       const char* const* env = nullptr)
   {
-    process pr (run_start (p, args, 0 /* stdin */, 1 /* stdout */, true, cwd));
+    process pr (run_start (process_env (p, env), args, 0, 1, true, cwd));
     run_finish (args, pr);
   }
 
   inline void
   run (const process_path& p,
        cstrings& args,
-       const dir_path& cwd = dir_path ())
+       const dir_path& cwd = dir_path (),
+       const char* const* env = nullptr)
   {
-    run (p, args.data (), cwd);
+    run (p, args.data (), cwd, env);
   }
 
   // As above, but search for the process (including updating args[0]) and
@@ -304,10 +306,14 @@ namespace build2
              int out,
              bool error = true,
              const dir_path& cwd = dir_path (),
+             const char* const* env = nullptr,
              const location& l = location ())
   {
     process_path pp (run_search (args[0], l));
-    return run_start (verbosity, pp, args, in, out, error, cwd, l);
+    return run_start (verbosity,
+                      process_env (pp, env), args,
+                      in, out, error,
+                      cwd, l);
   }
 
   inline process
@@ -317,31 +323,29 @@ namespace build2
              int out,
              bool error = true,
              const dir_path& cwd = dir_path (),
+             const char* const* env = nullptr,
              const location& l = location ())
   {
-    return run_start (verbosity, args.data (), in, out, error, cwd, l);
+    return run_start (verbosity, args.data (), in, out, error, cwd, env, l);
   }
 
   inline void
   run (uint16_t verbosity,
        const char* args[],
-       const dir_path& cwd = dir_path ())
+       const dir_path& cwd = dir_path (),
+       const char* const* env = nullptr)
   {
-    process pr (run_start (verbosity,
-                           args,
-                           0 /* stdin */,
-                           1 /* stdout */,
-                           true,
-                           cwd));
+    process pr (run_start (verbosity, args, 0, 1, true, cwd, env));
     run_finish (args, pr);
   }
 
   inline void
   run (uint16_t verbosity,
        cstrings& args,
-       const dir_path& cwd = dir_path ())
+       const dir_path& cwd = dir_path (),
+       const char* const* env = nullptr)
   {
-    run (verbosity, args.data (), cwd);
+    run (verbosity, args.data (), cwd, env);
   }
 
   // Start the process as above and then call the specified function on each
-- 
cgit v1.1