From 76be0a35f6c37cda7ba65530330f1ac246fb52a8 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Wed, 6 Apr 2022 11:26:52 +0200
Subject: Add support for rule hints

A rule hint is a target attribute, for example:

[rule_hint=cxx] exe{hello}: c{hello}

Rule hints can be used to resolve ambiguity when multiple rules match the same
target as well as to override an unambiguous match.
---
 libbuild2/cc/install-rule.cxx | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

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

diff --git a/libbuild2/cc/install-rule.cxx b/libbuild2/cc/install-rule.cxx
index 560b8a7..e8c87ae 100644
--- a/libbuild2/cc/install-rule.cxx
+++ b/libbuild2/cc/install-rule.cxx
@@ -97,7 +97,7 @@ namespace build2
       {
         if (header_source (p))
           pt = nullptr;
-        else if (p.type.see_through)
+        else if (p.type.see_through ())
         {
           for (i.enter_group (); i.group (); )
           {
@@ -151,15 +151,13 @@ namespace build2
     }
 
     bool install_rule::
-    match (action a, target& t, const string& hint) const
+    match (action a, target& t, const string&, match_extra& me) const
     {
-      // @@ How do we split the hint between the two?
-      //
-
       // We only want to handle installation if we are also the ones building
       // this target. So first run link's match().
       //
-      return link_.match (a, t, hint) && file_rule::match (a, t, "");
+      return link_.sub_match (x_link, update_id, a, t, me) &&
+        file_rule::match (a, t);
     }
 
     recipe install_rule::
@@ -332,7 +330,7 @@ namespace build2
       {
         if (header_source (p))
           pt = nullptr;
-        else if (p.type.see_through)
+        else if (p.type.see_through ())
         {
           for (i.enter_group (); i.group (); )
           {
@@ -372,12 +370,13 @@ namespace build2
     }
 
     bool libux_install_rule::
-    match (action a, target& t, const string& hint) const
+    match (action a, target& t, const string&, match_extra& me) const
     {
       // We only want to handle installation if we are also the ones building
       // this target. So first run link's match().
       //
-      return link_.match (a, t, hint) && alias_rule::match (a, t, "");
+      return link_.sub_match (x_link, update_id, a, t, me) &&
+        alias_rule::match (a, t);
     }
   }
 }
-- 
cgit v1.1