aboutsummaryrefslogtreecommitdiff
path: root/build2
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2020-05-15 12:11:30 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2020-05-27 08:28:34 +0200
commit02d902cb8e5e69b123fcdf170e5eeb9ca5605304 (patch)
tree29ed61127744a3fc1554bee96230342cae8f5972 /build2
parentba1fb800d20e7757cd8523a0793f63cff137c7cf (diff)
Amalgamation cutoff support
Now a project that disables amalgamation will not logically "see" an outer project even if it's physically inside its scope.
Diffstat (limited to 'build2')
-rw-r--r--build2/b.cxx4
1 files changed, 2 insertions, 2 deletions
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<dir_path> (l);
+ trace << " amalgamation: " << *a;
trace << " strong scope: " << *rs.strong_scope ();
trace << " weak scope: " << *rs.weak_scope ();
}