diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2016-07-21 10:04:18 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2016-07-21 10:04:18 +0200 |
| commit | d8f26e8402bbe19820545db90394f657ae42e598 (patch) | |
| tree | a1430c3077de2053ef32013c2eef5e50b840a43a /build2/bin/guess.cxx | |
| parent | de15b95d09d00821aa23e96a0c3e827689c27a58 (diff) | |
Save default/hinted ar/ld/rc values as commented out
This way, when we, for example, change the C++ compiler (which hinted these
values), they will be automatically adjusted as well.
Diffstat (limited to 'build2/bin/guess.cxx')
| -rw-r--r-- | build2/bin/guess.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/build2/bin/guess.cxx b/build2/bin/guess.cxx index 8a91015..de91db3 100644 --- a/build2/bin/guess.cxx +++ b/build2/bin/guess.cxx @@ -23,7 +23,7 @@ namespace build2 }; ar_info - guess_ar (const path& ar, const path& rl) + guess_ar (const path& ar, const path* rl) { tracer trace ("bin::guess_ar"); @@ -106,7 +106,7 @@ namespace build2 // Now repeat pretty much the same steps for ranlib if requested. // - if (!rl.empty ()) + if (rl != nullptr) { // Binutils, LLVM, and FreeBSD. // @@ -133,7 +133,7 @@ namespace build2 }; sha256 cs; - rlr = run<guess_result> (rl, "--version", f, false, false, &cs); + rlr = run<guess_result> (*rl, "--version", f, false, false, &cs); if (!rlr.empty ()) rlr.checksum = cs.string (); @@ -153,7 +153,7 @@ namespace build2 // Redirect STDERR to STDOUT and ignore exit status. // sha256 cs; - rlr = run<guess_result> (rl, f, false, true, &cs); + rlr = run<guess_result> (*rl, f, false, true, &cs); if (!rlr.empty ()) { @@ -163,7 +163,7 @@ namespace build2 } if (rlr.empty ()) - fail << "unable to guess " << rl << " signature"; + fail << "unable to guess " << *rl << " signature"; } return ar_info { |