diff options
author | Boris Kolpackov <boris@codesynthesis.com> | 2016-08-21 13:26:28 +0200 |
---|---|---|
committer | Boris Kolpackov <boris@codesynthesis.com> | 2016-08-21 13:26:28 +0200 |
commit | 0f9ce1c7022e5fa572886c9a9bda3a7e5c466314 (patch) | |
tree | 30a871a1bbf9d0f0e09f3953bf61bea16b540c71 /bpkg/utility.cxx | |
parent | c8459c886bab3a68631491059d1a5f300a3861cb (diff) |
Implement searching for b in bpkg's exec directory as last resort
This way if we run /opt/build2/bin/bpkg it will be able to find b in
/opt/build2/bin/ without PATH.
Diffstat (limited to 'bpkg/utility.cxx')
-rw-r--r-- | bpkg/utility.cxx | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/bpkg/utility.cxx b/bpkg/utility.cxx index 12ef220..002d316 100644 --- a/bpkg/utility.cxx +++ b/bpkg/utility.cxx @@ -167,15 +167,19 @@ namespace bpkg } } + dir_path exec_dir; + void - run (const char* args[]) + run (const char* args[], const dir_path& fallback) { - if (verb >= 2) - print_process (args); - try { - process pr (args); + process_path pp (process::path_search (args[0], fallback)); + + if (verb >= 2) + print_process (args); + + process pr (pp, args); if (!pr.wait ()) throw failed (); // Assume the child issued diagnostics. @@ -253,7 +257,13 @@ namespace bpkg args.push_back (bspec.c_str ()); args.push_back (nullptr); - run (args); + + // Use our executable directory as a fallback search since normally the + // entire toolchain is installed into one directory. This way, for + // example, if we installed into /opt/build2 and run bpkg with absolute + // path (and without PATH), then bpkg will be able to find "its" b. + // + run (args, exec_dir); } bool exception_unwinding_dtor = false; |