diff options
| -rw-r--r-- | build2/b.cxx | 4 | ||||
| -rw-r--r-- | build2/cc/windows-rpath.cxx | 2 | ||||
| -rw-r--r-- | libbuild2/scope.hxx | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/build2/b.cxx b/build2/b.cxx index 32d42aa..5ea4f02 100644 --- a/build2/b.cxx +++ b/build2/b.cxx @@ -1341,7 +1341,11 @@ main (int argc, char* argv[]) trace << " src_root: " << src_root; trace << " forwarded: " << (forwarded ? "true" : "false"); if (auto l = rs.vars[var_amalgamation]) + { trace << " amalgamation: " << cast<dir_path> (l); + trace << " strong scope: " << *rs.strong_scope (); + trace << " weak scope: " << *rs.weak_scope (); + } } // Enter project-wide (as opposed to global) variable overrides. diff --git a/build2/cc/windows-rpath.cxx b/build2/cc/windows-rpath.cxx index d18e36d..5b49033 100644 --- a/build2/cc/windows-rpath.cxx +++ b/build2/cc/windows-rpath.cxx @@ -293,7 +293,7 @@ namespace build2 // Symlink or copy the DLLs. // { - const scope& as (*t.root_scope ().weak_scope ()); // Amalgamation. + const scope& as (t.weak_scope ()); // Amalgamation. auto link = [&as, &ad] (const path& f, const path& l) { diff --git a/libbuild2/scope.hxx b/libbuild2/scope.hxx index 7b4fec5..455bcc6 100644 --- a/libbuild2/scope.hxx +++ b/libbuild2/scope.hxx @@ -367,7 +367,7 @@ namespace build2 inline ostream& operator<< (ostream& os, const scope& s) { - return os << s.out_path ().string (); // Always absolute. + return os << s.out_path ().representation (); // Always absolute. } // Temporary scope. The idea is to be able to create a temporary scope in |