From 02d902cb8e5e69b123fcdf170e5eeb9ca5605304 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Fri, 15 May 2020 12:11:30 +0200
Subject: Amalgamation cutoff support

Now a project that disables amalgamation will not logically "see" an outer
project even if it's physically inside its scope.
---
 libbuild2/config/operation.cxx | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'libbuild2/config/operation.cxx')

diff --git a/libbuild2/config/operation.cxx b/libbuild2/config/operation.cxx
index 37ff1a3..17eb99a 100644
--- a/libbuild2/config/operation.cxx
+++ b/libbuild2/config/operation.cxx
@@ -202,12 +202,10 @@ namespace build2
 
         if (inherit)
         {
-          if (auto l = rs.vars[ctx.var_amalgamation])
+          if (const dir_path* a = *rs.root_extra->amalgamation)
           {
-            const dir_path& d (cast<dir_path> (l));
-
             os << endl
-               << "# Base configuration inherited from " << d << endl
+               << "# Base configuration inherited from " << *a << endl
                << "#" << endl;
           }
         }
-- 
cgit v1.1