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

(limited to 'build2/cc/compile-rule.cxx')

diff --git a/build2/cc/compile-rule.cxx b/build2/cc/compile-rule.cxx
index 96e2dc5..cd49689 100644
--- a/build2/cc/compile-rule.cxx
+++ b/build2/cc/compile-rule.cxx
@@ -679,7 +679,6 @@ namespace build2
           //
           target_lock obj (add_adhoc_member (a, t, tts.obj, e.c_str ()));
           obj.target->as<file> ().derive_path (o);
-          match_recipe (obj, group_recipe); // Set recipe and unlock.
         }
       }
 
@@ -5408,6 +5407,7 @@ namespace build2
 
       otype ot (compile_type (t, ut));
       linfo li (link_info (bs, ot));
+      compile_target_types tts (compile_types (ot));
 
       environment env;
       cstrings args {cpath.recall_string ()};
@@ -5419,7 +5419,7 @@ namespace build2
       path relo (ut == unit_type::module_header
                  ? path ()
                  : relative (ut == unit_type::module_iface
-                             ? t.member->is_a<file> ()->path ()
+                             ? find_adhoc_member<file> (t, tts.obj)->path ()
                              : tp));
 
       // Build the command line.
-- 
cgit v1.1