From 6082d76936b8a65380eb7af03b4167d8f0298158 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Thu, 21 Apr 2016 12:18:15 +0200 Subject: Implement short-circuiting to group state This is necessary to get rid of bogus restarts in inject_prerequisites() where it think a group member was updated since its state changed from unknown to (group's) changed. --- build2/cli/rule.cxx | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'build2/cli') diff --git a/build2/cli/rule.cxx b/build2/cli/rule.cxx index 65e940b..d986eca 100644 --- a/build2/cli/rule.cxx +++ b/build2/cli/rule.cxx @@ -108,13 +108,13 @@ namespace build2 // target& t (xt); - // First see if we are already linked-up to the cli.cxx{} group. - // If it is some other group, then we are definitely not a match. + // First see if we are already linked-up to the cli.cxx{} group. If + // it is some other group, then we are definitely not a match. // if (t.group != nullptr) return t.group->is_a (); - // Then check if there is a corresponding cli.cxx{} group. + // Check if there is a corresponding cli.cxx{} group. // cli_cxx* g (targets.find (t.dir, t.out, t.name)); @@ -147,8 +147,8 @@ namespace build2 if (g != nullptr) { - // Resolve the group's members. This should link us up to - // the group. + // Resolve the group's members. This should link us up to the + // group. // resolve_group_members (a, *g); -- cgit v1.1