From 5974cab56148a18628bfb423189e016ade2d40f9 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Mon, 31 Aug 2015 13:45:57 +0200 Subject: Rework scoping logic Now the src directory is entered into the scope map and points to the same scope as out. This means that targets that are in src, not out (e.g., source files) will "see" rules, variables, etc. This becomes important when we try, for example, to install a source file (say, a header) from src: we need the rule as well as the install.* variables. --- build/algorithm.ixx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'build/algorithm.ixx') diff --git a/build/algorithm.ixx b/build/algorithm.ixx index ac2b1fc..72a04fe 100644 --- a/build/algorithm.ixx +++ b/build/algorithm.ixx @@ -109,7 +109,7 @@ namespace build t, a.operation () != clean_id ? dir_path () - : t.strong_scope ().path ()); + : t.strong_scope ().out_path ()); } inline void @@ -122,7 +122,7 @@ namespace build // through groups since the group target should clean eveything // up. A bit of an optimization. // - search_and_match_prerequisites (a, t, t.strong_scope ().path ()); + search_and_match_prerequisites (a, t, t.strong_scope ().out_path ()); } target_state -- cgit v1.1