From 865f3a28be3977ec9c781aa4dd15fccefb98ca39 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Thu, 21 Jul 2022 16:54:02 +0200
Subject: Use bundle scope when deciding whether project is being distributed

---
 libbuild2/parser.cxx | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'libbuild2')

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)
       {
-- 
cgit v1.1