From 02d902cb8e5e69b123fcdf170e5eeb9ca5605304 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Fri, 15 May 2020 12:11:30 +0200 Subject: Amalgamation cutoff support Now a project that disables amalgamation will not logically "see" an outer project even if it's physically inside its scope. --- build2/b.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'build2') diff --git a/build2/b.cxx b/build2/b.cxx index 0ff4e5c..cdcfd59 100644 --- a/build2/b.cxx +++ b/build2/b.cxx @@ -1395,9 +1395,9 @@ main (int argc, char* argv[]) trace << " out_root: " << out_root; trace << " src_root: " << src_root; trace << " forwarded: " << (forwarded ? "true" : "false"); - if (auto l = rs.vars[ctx->var_amalgamation]) + if (const dir_path* a = *rs.root_extra->amalgamation) { - trace << " amalgamation: " << cast (l); + trace << " amalgamation: " << *a; trace << " strong scope: " << *rs.strong_scope (); trace << " weak scope: " << *rs.weak_scope (); } -- cgit v1.1