diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2020-05-15 12:11:30 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2020-05-27 08:28:34 +0200 |
| commit | 02d902cb8e5e69b123fcdf170e5eeb9ca5605304 (patch) | |
| tree | 29ed61127744a3fc1554bee96230342cae8f5972 /libbuild2/config | |
| parent | ba1fb800d20e7757cd8523a0793f63cff137c7cf (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 'libbuild2/config')
| -rw-r--r-- | libbuild2/config/operation.cxx | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/libbuild2/config/operation.cxx b/libbuild2/config/operation.cxx index 37ff1a3..17eb99a 100644 --- a/libbuild2/config/operation.cxx +++ b/libbuild2/config/operation.cxx @@ -202,12 +202,10 @@ namespace build2 if (inherit) { - if (auto l = rs.vars[ctx.var_amalgamation]) + if (const dir_path* a = *rs.root_extra->amalgamation) { - const dir_path& d (cast<dir_path> (l)); - os << endl - << "# Base configuration inherited from " << d << endl + << "# Base configuration inherited from " << *a << endl << "#" << endl; } } |