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. --- libbuild2/operation.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libbuild2/operation.cxx') 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 (rs[ctx.var_project_url]) << endl << "src_root: " << cast (rs[ctx.var_src_root]) << endl << "out_root: " << cast (rs[ctx.var_out_root]) << endl - << "amalgamation: " << cast_empty (rs[ctx.var_amalgamation]) << endl + << "amalgamation: " << (*rs.root_extra->amalgamation != nullptr ? **rs.root_extra->amalgamation : empty_dir_path) << endl << "subprojects: " << cast_empty (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; -- cgit v1.1