From f8de93520fd604a3771a2af3ca9564f6085d8baa Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Thu, 1 Dec 2022 10:00:37 +0200 Subject: Make dist::rule reusable as base --- libbuild2/dist/init.cxx | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) (limited to 'libbuild2/dist/init.cxx') diff --git a/libbuild2/dist/init.cxx b/libbuild2/dist/init.cxx index 9de84ce..26ff86d 100644 --- a/libbuild2/dist/init.cxx +++ b/libbuild2/dist/init.cxx @@ -21,6 +21,8 @@ namespace build2 { namespace dist { + static const rule rule_; + void boot (scope& rs, const location&, module_boot_extra& extra) { @@ -194,7 +196,7 @@ namespace build2 const location& l, bool first, bool, - module_init_extra& extra) + module_init_extra&) { tracer trace ("dist::init"); @@ -206,19 +208,13 @@ namespace build2 l5 ([&]{trace << "for " << rs;}); - module& mod (extra.module_as ()); - auto& vp (rs.var_pool (true /* public */)); // All qualified. // Register our wildcard rule. Do it explicitly for the alias to prevent // something like insert(dist_id, test_id) taking precedence. // - { - const rule& r (mod); - - rs.insert_rule (dist_id, 0, "dist", r); - rs.insert_rule (dist_id, 0, "dist.alias", r); - } + rs.insert_rule (dist_id, 0, "dist", rule_); + rs.insert_rule (dist_id, 0, "dist.alias", rule_); // We need this rule for out-of-any-project dependencies (for example, // executables imported from /usr/bin, etc). We are registering it on -- cgit v1.1