aboutsummaryrefslogtreecommitdiff
path: root/build/config/module.cxx
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2015-04-20 15:34:16 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2015-04-20 15:34:16 +0200
commit4c44c914d898af53152addad5530504548175e85 (patch)
treef319c76b681e44874f887bfb5d085d59aa1e662d /build/config/module.cxx
parenta82cdb8fd9ba02034d296769772cdf81244da66a (diff)
Merge config.cxx.* variables into cxx.* when loading cxx module
Diffstat (limited to 'build/config/module.cxx')
-rw-r--r--build/config/module.cxx12
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