Merge config.cxx.* variables into cxx.* when loading cxx module

1 files changed, 9 insertions, 3 deletions

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