From f5090740dcb36067707ff40e0d41cdbeef15e63e Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Sat, 15 Oct 2016 17:57:55 +0200 Subject: Add support for skipping rule in delegate_match() --- build2/algorithm.cxx | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'build2/algorithm.cxx') diff --git a/build2/algorithm.cxx b/build2/algorithm.cxx index 8dc5621..2390b04 100644 --- a/build2/algorithm.cxx +++ b/build2/algorithm.cxx @@ -53,7 +53,7 @@ namespace build2 } pair - match_impl (action a, target& t, bool apply) + match_impl (action a, target& t, bool apply, const rule* skip) { pair r; @@ -97,8 +97,8 @@ namespace build2 if (om == nullptr) continue; // No entry for this meta-operation id. - // First try the map for the actual operation. If that - // doesn't yeld anything, try the wildcard map. + // First try the map for the actual operation. If that doesn't yeld + // anything, try the wildcard map. // for (size_t oi (o), oip (o); oip != 0; oip = oi, oi = 0) { @@ -140,6 +140,9 @@ namespace build2 const string& n (i->first); const rule& ru (i->second); + if (&ru == skip) + continue; + match_result m; { auto g ( -- cgit v1.1