From 8475c82a2ca186f4ca987e50b4249bb8eb32ba01 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Thu, 3 Mar 2022 12:48:07 +0200
Subject: Add support for update=unmatch|match to ad hoc recipes

---
 libbuild2/cc/compile-rule.cxx | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

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

diff --git a/libbuild2/cc/compile-rule.cxx b/libbuild2/cc/compile-rule.cxx
index aaaa43c..e7e90ad 100644
--- a/libbuild2/cc/compile-rule.cxx
+++ b/libbuild2/cc/compile-rule.cxx
@@ -1010,7 +1010,7 @@ namespace build2
         // @@ If for some reason unmatch fails, this messes up the for_install
         //    logic because we will update this library during match. Perhaps
         //    we should postpone updating them until execute if we failed to
-        //    unmatch.
+        //    unmatch. See how we do this in ad hoc rule.
         //
         pair<bool, target_state> mr (
           build2::match (
@@ -5889,7 +5889,10 @@ namespace build2
       ps.push_back (prerequisite (lt));
       for (prerequisite_member p: group_prerequisite_members (a, lt))
       {
-        if (include (a, lt, p) != include_type::normal) // Excluded/ad hoc.
+        // Ignore update=match.
+        //
+        lookup l;
+        if (include (a, lt, p, &l) != include_type::normal) // Excluded/ad hoc.
           continue;
 
         if (p.is_a<libx> () ||
@@ -6123,7 +6126,10 @@ namespace build2
         //
         for (prerequisite_member p: group_prerequisite_members (a, t))
         {
-          if (include (a, t, p) != include_type::normal) // Excluded/ad hoc.
+          // Ignore update=match.
+          //
+          lookup l;
+          if (include (a, t, p, &l) != include_type::normal) // Excluded/ad hoc.
             continue;
 
           if (p.is_a<libx> () ||
-- 
cgit v1.1