From af55babfc0c01abbd0a074b0d2ed86598d6bf628 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Thu, 1 Dec 2022 10:01:24 +0200
Subject: Fix corner case in distributing via obj{}, libul{} groups

---
 libbuild2/bin/init.cxx | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'libbuild2/bin/init.cxx')

diff --git a/libbuild2/bin/init.cxx b/libbuild2/bin/init.cxx
index d7c5b5a..78119cb 100644
--- a/libbuild2/bin/init.cxx
+++ b/libbuild2/bin/init.cxx
@@ -605,6 +605,18 @@ namespace build2
 
         if (rs.find_module ("dist"))
         {
+          // Note that without custom dist rules in setups along the follwing
+          // lines the source file will be unreachable by dist:
+          //
+          // lib{foo}: obj{foo}
+          // obja{foo}: cxx{foo}
+          // objs{foo}: cxx{foo}
+          //
+          r.insert<obj> (dist_id, 0, "bin.obj", obj_);
+          r.insert<bmi> (dist_id, 0, "bin.bmi", obj_);
+          r.insert<hbmi> (dist_id, 0, "bin.hbmi", obj_);
+          r.insert<libul> (dist_id, 0, "bin.libul", libul_);
+
           r.insert<lib> (dist_id, 0, "bin.lib", lib_);
         }
       }
-- 
cgit v1.1