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/operation.cxx | |
| 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/operation.cxx')
| -rw-r--r-- | libbuild2/operation.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libbuild2/operation.cxx b/libbuild2/operation.cxx index 5b549a4..d56e416 100644 --- a/libbuild2/operation.cxx +++ b/libbuild2/operation.cxx @@ -549,7 +549,7 @@ namespace build2 << "url: " << cast_empty<string> (rs[ctx.var_project_url]) << endl << "src_root: " << cast<dir_path> (rs[ctx.var_src_root]) << endl << "out_root: " << cast<dir_path> (rs[ctx.var_out_root]) << endl - << "amalgamation: " << cast_empty<dir_path> (rs[ctx.var_amalgamation]) << endl + << "amalgamation: " << (*rs.root_extra->amalgamation != nullptr ? **rs.root_extra->amalgamation : empty_dir_path) << endl << "subprojects: " << cast_empty<subprojects> (rs[ctx.var_subprojects]) << endl << "operations:"; print_ops (rs.root_extra->operations, ctx.operation_table); cout << endl << "meta-operations:"; print_ops (rs.root_extra->meta_operations, ctx.meta_operation_table); cout << endl; |