diff options
| -rw-r--r-- | libbuild2/bin/guess.cxx | 2 | ||||
| -rw-r--r-- | libbuild2/cc/guess.cxx | 150 | ||||
| -rw-r--r-- | libbuild2/cc/windows-rpath.cxx | 2 | ||||
| -rw-r--r-- | libbuild2/test/rule.cxx | 2 | ||||
| -rw-r--r-- | libbuild2/utility.cxx | 10 | ||||
| -rw-r--r-- | libbuild2/utility.hxx | 5 |
6 files changed, 118 insertions, 53 deletions
diff --git a/libbuild2/bin/guess.cxx b/libbuild2/bin/guess.cxx index 633c798..67fdc58 100644 --- a/libbuild2/bin/guess.cxx +++ b/libbuild2/bin/guess.cxx @@ -50,7 +50,7 @@ namespace build2 if (paths != nullptr) { process_path r ( - try_run_search (prog, + run_try_search (prog, true /* init */, dir_path () /* fallback */, true /* path_only */, diff --git a/libbuild2/cc/guess.cxx b/libbuild2/cc/guess.cxx index 309158c..9f91eae 100644 --- a/libbuild2/cc/guess.cxx +++ b/libbuild2/cc/guess.cxx @@ -430,6 +430,12 @@ namespace build2 #if defined(_WIN32) && !defined(BUILD2_BOOTSTRAP) + static inline void + msvc_info_deleter (void* p) + { + delete static_cast<msvc_info*> (p); + } + // We more or less follow the logic in the Clang 'simplementation (see // MSVC.cpp for details) but don't use the high level APIs (bstr_t, // com_ptr_t, etc) and the VC extensions (__uuidof(), class uuid @@ -460,8 +466,13 @@ namespace build2 0x42B21B78, 0x6192, 0x463E, {0x87, 0xBF, 0xD5, 0x77, 0x83, 0x8F, 0x1D, 0x5C}}; + // If cl is not empty, then find an installation that contains this cl.exe + // path. + // + // @@ TODO: if (cl.sub (r.msvc_dir)) ... + // static optional<msvc_info> - find_msvc () + find_msvc (const path& /*cl*/ = path ()) { using namespace butl; @@ -752,7 +763,6 @@ namespace build2 process_path xp; info_ptr search_info (nullptr, guess_result::null_info_deleter); - for (;;) // Breakout loop. { auto df = make_diag_frame ( [&xm](const diag_record& dr) @@ -760,6 +770,36 @@ namespace build2 dr << info << "use config." << xm << " to override"; }); + // Normally we just search in PATH but in some situations we may need + // to fallback to an ad hoc search method. And the tricky question in + // this case is what should the recall path be. It's natural to make + // it the same as effective (which happens automatically if we use the + // fallback directory mechanism of run_search()) so that any command + // lines that we print are re-runnable by the user. + // + // On the other hand, passing the effective path (which would normally + // be absolute) to recursive instances of the build system (e.g., when + // running tests) will inhibit the ad hoc search which may supply + // other parts of the "environment" necessary to use the compiler. The + // good example of this is MSVC cl.exe which doesn't have any default + // header/library search paths (and which are normally supplied by the + // INCLUDE/LIB environment variables or explicitly via the command + // line). + // + // So a sensible strategy here would be to use the effective path if + // that's all that's required for the compiler to function (as, for + // example, is the case for Clang targeting MSVC) and use the initial + // path otherwise, thus triggering the same ad hoc search in any + // recursive instances. + // + // The main drawback of the latter, of course, is that the commands we + // print are no longer re-runnable (even though we may have supplied + // the rest of the "environment" explicitly on the command line). + // + // An alternative strategy is to try and obtain the corresponding + // "environment" in case of the effective (absolute) path similar to + // how it is done in case of the ad hoc search. + // dir_path fb; // Fallback search directory. #ifdef _WIN32 @@ -781,74 +821,88 @@ namespace build2 { // Ignore it. } - - goto search; } } +#endif + + // Only search in PATH (specifically, omitting the current + // executable's directory on Windows). + // + // Note that the process_path instance will be cached (as part of + // compiler_info) so init is false. + // + xp = run_try_search (xc, + false /* init */, + fb, + true /* path_only */); -#ifndef BUILD2_BOOTSTRAP +#if defined(_WIN32) && !defined(BUILD2_BOOTSTRAP) // If we pre-guessed MSVC or Clang (including clang-cl) try the search // and if not found, try to locate the MSVC installation and fallback // on that. // - if (xc.simple () && - (pt == type::clang || - (pt == type::msvc && (!pv || *pv == "clang")))) + if (xp.empty ()) { - if (!(xp = try_run_search (xc, false, dir_path (), true)).empty ()) - break; - - if (optional<msvc_info> mi = find_msvc ()) + if (xc.simple () && + (pt == type::clang || + (pt == type::msvc && (!pv || *pv == "clang")))) { - try + if (optional<msvc_info> mi = find_msvc ()) { - if (pt == type::msvc && !pv) + try { - // With MSVC you get a compiler binary per target (i.e., there - // is nothing like -m32/-m64 or /MACHINE). Targeting 64-bit - // seems like as good of a default as any. - // - fb = ((dir_path (mi->msvc_dir) /= "bin") /= "Hostx64") /= "x64"; + if (pt == type::msvc && !pv) + { + // With MSVC you get a compiler binary per target (i.e., + // there is nothing like -m32/-m64 or /MACHINE). Targeting + // 64-bit seems like as good of a default as any. + // + fb = ((dir_path (mi->msvc_dir) /= "bin") /= "Hostx64") /= + "x64"; + + search_info = info_ptr ( + new msvc_info (move (*mi)), msvc_info_deleter); + } + else + { + // Get to ...\VC\Tools\ from ...\VC\Tools\MSVC\<ver>\. + // + fb = (dir_path (mi->msvc_dir) /= "..") /= ".."; + fb.normalize (); + (fb /= "Llvm") /= "bin"; + + // Note that in this case we drop msvc_info and extract it + // directly from Clang later. + } - search_info = info_ptr (new msvc_info (move (*mi)), - [] (void* p) - { - delete static_cast<msvc_info*> (p); - }); + xp = run_try_search (xc, false, fb, true); } - else + catch (const invalid_path&) { - // Get to ...\VC\Tools\ from ...\VC\Tools\MSVC\<ver>\. - // - fb = (dir_path (mi->msvc_dir) /= "..") /= ".."; - fb.normalize (); - (fb /= "Llvm") /= "bin"; - - // Note that in this case we drop msvc_info and extract it - // directly from Clang later. + // Ignore it. } } - catch (const invalid_path&) + } + } + else + { + // We try to find the matching installation only for MSVC (for Clang + // we extract this information from the compiler). + // + if (xc.absolute () && + (pt == type::msvc && !pv)) + { + if (optional<msvc_info> mi = find_msvc (xc)) { - fb.clear (); // Ignore it. + search_info = info_ptr ( + new msvc_info (move (*mi)), msvc_info_deleter); } - - goto search; } } #endif - search: -#endif - - // Only search in PATH (specifically, omitting the current - // executable's directory on Windows). - // - xp = run_search (xc, - false /* init (note: result is cached) */, - fb, - true /* path_only */); - break; + if (xp.empty ()) + run_search_fail (xc); } // Start with -v. This will cover gcc and clang (including clang-cl). diff --git a/libbuild2/cc/windows-rpath.cxx b/libbuild2/cc/windows-rpath.cxx index b5d82b1..2ea5b08 100644 --- a/libbuild2/cc/windows-rpath.cxx +++ b/libbuild2/cc/windows-rpath.cxx @@ -2,7 +2,7 @@ // copyright : Copyright (c) 2014-2019 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#include <errno.h> // E* +#include <cerrno> // E* #include <libbuild2/scope.hxx> #include <libbuild2/context.hxx> diff --git a/libbuild2/test/rule.cxx b/libbuild2/test/rule.cxx index c216e66..9187125 100644 --- a/libbuild2/test/rule.cxx +++ b/libbuild2/test/rule.cxx @@ -808,7 +808,7 @@ namespace build2 // process_path pp (!ctx.dry_run ? run_search (p, true /* init */) - : try_run_search (p, true)); + : run_try_search (p, true)); args.push_back (pp.empty () ? p.string ().c_str () : pp.recall_string ()); // Do we have options and/or arguments? diff --git a/libbuild2/utility.cxx b/libbuild2/utility.cxx index 10e2380..af4768c 100644 --- a/libbuild2/utility.cxx +++ b/libbuild2/utility.cxx @@ -6,6 +6,7 @@ #include <time.h> // tzset() (POSIX), _tzset() (Windows) +#include <cerrno> // ENOENT #include <cstring> // strlen(), str[n]cmp() #include <iostream> // cerr @@ -183,7 +184,7 @@ namespace build2 } process_path - try_run_search (const path& f, + run_try_search (const path& f, bool init, const dir_path& fallback, bool path_only, @@ -192,6 +193,13 @@ namespace build2 return process::try_path_search (f, init, fallback, path_only, paths); } + [[noreturn]] void + run_search_fail (const path& f, const location& l) + { + fail (l) << "unable to execute " << f << ": " << process_error (ENOENT) + << endf; + } + process run_start (uint16_t verbosity, const process_env& pe, diff --git a/libbuild2/utility.hxx b/libbuild2/utility.hxx index 956d213..beacd2f 100644 --- a/libbuild2/utility.hxx +++ b/libbuild2/utility.hxx @@ -222,12 +222,15 @@ namespace build2 const location& = location ()); LIBBUILD2_SYMEXPORT process_path - try_run_search (const path&, + run_try_search (const path&, bool init = false, const dir_path& fallback = dir_path (), bool path_only = false, const char* paths = nullptr); + [[noreturn]] LIBBUILD2_SYMEXPORT void + run_search_fail (const path&, const location& = location ()); + // Wait for process termination. Issue diagnostics and throw failed in case // of abnormal termination. If the process has terminated normally but with // a non-zero exit status, then, if error is true, assume the diagnostics |