From 8276259438592439236341b74300cb5538303c83 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Tue, 14 Jul 2015 09:47:40 +0200
Subject: Add notion of strong/weak amalgamation, make strong new clean
 boundary

---
 build/file.cxx | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'build/file.cxx')

diff --git a/build/file.cxx b/build/file.cxx
index 0dff025..b137c32 100644
--- a/build/file.cxx
+++ b/build/file.cxx
@@ -579,6 +579,11 @@ namespace build
 
     bootstrap_src (rs);
     create_bootstrap_outer (rs);
+
+    // Check if we are strongly amalgamated by this outer root scope.
+    //
+    if (root.src_path ().sub (rs.src_path ()))
+      root.strong_ = rs.strong_scope (); // Itself or some outer scope.
   }
 
   scope&
@@ -612,6 +617,11 @@ namespace build
 
         bootstrap_src (rs);
 
+        // Check if we strongly amalgamated this inner root scope.
+        //
+        if (rs.src_path ().sub (root.src_path ()))
+          rs.strong_ = root.strong_scope (); // Itself or some outer scope.
+
         // See if there are more inner roots.
         //
         return create_bootstrap_inner (rs, out_base);
-- 
cgit v1.1