From 8276259438592439236341b74300cb5538303c83 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Tue, 14 Jul 2015 09:47:40 +0200 Subject: Add notion of strong/weak amalgamation, make strong new clean boundary --- build/algorithm.ixx | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'build/algorithm.ixx') diff --git a/build/algorithm.ixx b/build/algorithm.ixx index d4d0ec8..c4f5815 100644 --- a/build/algorithm.ixx +++ b/build/algorithm.ixx @@ -71,7 +71,11 @@ namespace build search_and_match_prerequisites (action a, target& t) { search_and_match_prerequisites ( - a, t, a.operation () != clean_id ? dir_path () : t.dir); + a, + t, + a.operation () != clean_id + ? dir_path () + : t.strong_scope ().path ()); } inline void @@ -80,11 +84,11 @@ namespace build if (a.operation () != clean_id) search_and_match_prerequisite_members (a, t, dir_path ()); else - // Note that here we don't iterate over members even for see + // Note that here we don't iterate over members even for see- // through groups since the group target should clean eveything // up. A bit of an optimization. // - search_and_match_prerequisites (a, t, t.dir); + search_and_match_prerequisites (a, t, t.strong_scope ().path ()); } target_state -- cgit v1.1