aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2022-07-21 16:54:02 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2022-07-21 16:54:02 +0200
commit865f3a28be3977ec9c781aa4dd15fccefb98ca39 (patch)
tree092d6b613021192769964132210583c0fd7bd71c
parent74df8e7913811d96947c780b7f68adbe3400121e (diff)
Use bundle scope when deciding whether project is being distributed
-rw-r--r--libbuild2/parser.cxx5
1 files changed, 3 insertions, 2 deletions
diff --git a/libbuild2/parser.cxx b/libbuild2/parser.cxx
index 23e9d0e..da017d3 100644
--- a/libbuild2/parser.cxx
+++ b/libbuild2/parser.cxx
@@ -2389,9 +2389,10 @@ namespace build2
{
// Only issue the warning for the projects being distributed. In
// particular, this makes sure we don't complain about imported
- // projects.
+ // projects. Note: use amalgamation to cover bundled subprojects.
//
- auto* dm (root_->find_module<dist::module> (dist::module::name));
+ auto* dm (root_->bundle_scope ()->find_module<dist::module> (
+ dist::module::name));
if (dm != nullptr && dm->distributed)
{