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/msvc.cxx | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

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

diff --git a/build2/cc/msvc.cxx b/build2/cc/msvc.cxx
index 32805c7..08cd43c 100644
--- a/build2/cc/msvc.cxx
+++ b/build2/cc/msvc.cxx
@@ -8,6 +8,7 @@
 #include <build2/target.hxx>
 #include <build2/context.hxx>
 #include <build2/variable.hxx>
+#include <build2/algorithm.hxx>
 #include <build2/filesystem.hxx>
 #include <build2/diagnostics.hxx>
 
@@ -177,7 +178,7 @@ namespace build2
           //
           path i (
             lt == otype::s
-            ? t.member->as<file> ().path ().leaf ()
+            ? find_adhoc_member<libi> (t)->path ().leaf ()
             : t.path ().leaf ().base () + ".lib");
 
           if (l.find (i.string ())                  != string::npos &&
@@ -467,11 +468,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);
 
             // Presumably there is a DLL somewhere, we just don't know where.
             //
-- 
cgit v1.1