From 59692f8b9fa2b71711de78d07f031c4866024da4 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Mon, 13 May 2019 12:18:15 +0200
Subject: Remove order dependence in ad hoc group handling

Also, don't match group_recipe since we neither execute nor access the
state.
---
 build2/cc/common.cxx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'build2/cc/common.cxx')

diff --git a/build2/cc/common.cxx b/build2/cc/common.cxx
index aca1240..d4c60ec 100644
--- a/build2/cc/common.cxx
+++ b/build2/cc/common.cxx
@@ -657,11 +657,11 @@ namespace build2
               {
                 if (l.owns_lock ())
                 {
-                  s->member = i;
+                  s->member = i; // We are first.
                   l.unlock ();
                 }
                 else
-                  assert (s->member == i);
+                  assert (find_adhoc_member<libi> (*s) == i);
 
                 i->mtime (mt);
                 i->path (move (f));
-- 
cgit v1.1