aboutsummaryrefslogtreecommitdiff
path: root/libbuild2/dist/init.cxx
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2020-01-29 09:19:06 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2020-01-29 09:19:06 +0200
commitc4fcbad1cb603756dc4dac65392feb86be1a722d (patch)
treeda9c9c2278c63d20237a7178fde450d7472a59c9 /libbuild2/dist/init.cxx
parentccb417a7c1456427b76914e8a11ca87b4926eeb3 (diff)
Rename module_base to module, redo module boot/init argument passing
Diffstat (limited to 'libbuild2/dist/init.cxx')
-rw-r--r--libbuild2/dist/init.cxx9
1 files changed, 3 insertions, 6 deletions
diff --git a/libbuild2/dist/init.cxx b/libbuild2/dist/init.cxx
index 93bcfdb..30cd56b 100644
--- a/libbuild2/dist/init.cxx
+++ b/libbuild2/dist/init.cxx
@@ -24,7 +24,7 @@ namespace build2
static const rule rule_;
bool
- boot (scope& rs, const location&, unique_ptr<module_base>& mod)
+ boot (scope& rs, const location&, module_boot_extra& extra)
{
tracer trace ("dist::boot");
@@ -77,7 +77,7 @@ namespace build2
// Create the module.
//
- mod.reset (new module (v_d_p));
+ extra.set_module (new module (v_d_p));
return false;
}
@@ -86,10 +86,9 @@ namespace build2
init (scope& rs,
scope&,
const location& l,
- unique_ptr<module_base>&,
bool first,
bool,
- const variable_map& config_hints)
+ module_init_extra&)
{
tracer trace ("dist::init");
@@ -101,8 +100,6 @@ namespace build2
l5 ([&]{trace << "for " << rs;});
- assert (config_hints.empty ()); // We don't known any hints.
-
// Register our wildcard rule. Do it explicitly for the alias to prevent
// something like insert<target>(dist_id, test_id) taking precedence.
//