diff options
author | Boris Kolpackov <boris@codesynthesis.com> | 2015-07-14 09:47:40 +0200 |
---|---|---|
committer | Boris Kolpackov <boris@codesynthesis.com> | 2015-07-14 09:47:40 +0200 |
commit | 8276259438592439236341b74300cb5538303c83 (patch) | |
tree | 0e072ee31bd13ff55f2c3e0d4a0b50725f8dd73f /build/algorithm.ixx | |
parent | 70613e9be046c9cddd2486505a44d3a0324d6d95 (diff) |
Add notion of strong/weak amalgamation, make strong new clean boundary
Diffstat (limited to 'build/algorithm.ixx')
-rw-r--r-- | build/algorithm.ixx | 10 |
1 files changed, 7 insertions, 3 deletions
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 |