aboutsummaryrefslogtreecommitdiff
path: root/libbuild2/bin
diff options
context:
space:
mode:
Diffstat (limited to 'libbuild2/bin')
-rw-r--r--libbuild2/bin/init.cxx7
-rw-r--r--libbuild2/bin/rule.cxx7
2 files changed, 11 insertions, 3 deletions
diff --git a/libbuild2/bin/init.cxx b/libbuild2/bin/init.cxx
index 344d54e..c0681cc 100644
--- a/libbuild2/bin/init.cxx
+++ b/libbuild2/bin/init.cxx
@@ -539,7 +539,7 @@ namespace build2
r.insert<lib> (perform_id, 0, "bin.lib", lib_);
r.insert<lib> (configure_id, 0, "bin.lib", lib_);
- // Treat as a see through group for install and test.
+ // Treat as a see through group for install, test, and dist.
//
if (install_loaded)
{
@@ -553,6 +553,11 @@ namespace build2
{
r.insert<lib> (perform_test_id, "bin.lib", m->group_rule ());
}
+
+ if (rs.find_module ("dist"))
+ {
+ r.insert<lib> (dist_id, 0, "bin.lib", lib_);
+ }
}
return true;
diff --git a/libbuild2/bin/rule.cxx b/libbuild2/bin/rule.cxx
index 8c1174a..0bb5aed 100644
--- a/libbuild2/bin/rule.cxx
+++ b/libbuild2/bin/rule.cxx
@@ -53,11 +53,14 @@ namespace build2
}
bool lib_rule::
- match (action, target& xt, const string&) const
+ match (action a, target& xt, const string&) const
{
lib& t (xt.as<lib> ());
- members bm (build_members (t.root_scope ()));
+ members bm (a.meta_operation () != dist_id
+ ? build_members (t.root_scope ())
+ : members {true, true});
+
t.a = bm.a ? &search<liba> (t, t.dir, t.out, t.name) : nullptr;
t.s = bm.s ? &search<libs> (t, t.dir, t.out, t.name) : nullptr;