From 4c44c914d898af53152addad5530504548175e85 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Mon, 20 Apr 2015 15:34:16 +0200
Subject: Merge config.cxx.* variables into cxx.* when loading cxx module

---
 build/config/module.cxx | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'build/config/module.cxx')

diff --git a/build/config/module.cxx b/build/config/module.cxx
index 9ed0cec..426b1f6 100644
--- a/build/config/module.cxx
+++ b/build/config/module.cxx
@@ -18,11 +18,17 @@ namespace build
   namespace config
   {
     static bool
-    trigger (scope&, const path& p)
+    trigger (bool pre, scope& base, path& p)
     {
       tracer trace ("config::trigger");
-      level4 ([&]{trace << "intercepted sourcing of " << p;});
-      return file_exists (p);
+
+      if (pre)
+      {
+        level4 ([&]{trace << "intercepted sourcing of " << p;});
+        return file_exists (p);
+      }
+      else
+        return true;
     }
 
     void
-- 
cgit v1.1