From 4da38e50a096e9aa19a75149bcc9dbb6e1de901e Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Mon, 6 Mar 2017 10:29:00 +0200
Subject: Iterate over group members in test rule only if resolvable

---
 build2/target.ixx | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'build2/target.ixx')

diff --git a/build2/target.ixx b/build2/target.ixx
index f581e5e..0be5aed 100644
--- a/build2/target.ixx
+++ b/build2/target.ixx
@@ -198,7 +198,7 @@ namespace build2
   {
     if (k_ != nullptr) // Iterating over an ad hoc group.
       k_ = k_->member;
-    else if (r_->members_)
+    else if (r_->mode_ != members_mode::never)
     {
       // Get the target if one has been resolved and see if it's an ad hoc
       // group. If so, switch to the ad hoc mode.
@@ -223,7 +223,9 @@ namespace build2
     {
       ++i_;
 
-      if (r_->members_ && i_ != r_->e_ && i_->type.see_through)
+      if (r_->mode_ != members_mode::never &&
+          i_ != r_->e_                     &&
+          i_->type.see_through)
         switch_mode ();
     }
 
-- 
cgit v1.1