1 files changed, 28 insertions, 9 deletions

diff --git a/libbuild2/cc/link-rule.hxx b/libbuild2/cc/link-rule.hxx
index c6d06d2..9b491c2 100644
--- a/libbuild2/cc/link-rule.hxx
+++ b/libbuild2/cc/link-rule.hxx
@@ -18,11 +18,13 @@ namespace build2
 {
   namespace cc
   {
-    class LIBBUILD2_CC_SYMEXPORT link_rule: public simple_rule, virtual common
+    class LIBBUILD2_CC_SYMEXPORT link_rule: public rule, virtual common
     {
     public:
       link_rule (data&&);
 
+      struct match_data;
+
       struct match_result
       {
         bool seen_x   = false;
@@ -46,18 +48,21 @@ namespace build2
       match (action, const target&, const target*, otype, bool) const;
 
       virtual bool
-      match (action, target&, const string&) const override;
+      match (action, target&, const string&, match_extra&) const override;
 
       virtual recipe
-      apply (action, target&) const override;
+      apply (action, target&, match_extra&) const override;
 
       target_state
-      perform_update (action, const target&) const;
+      perform_update (action, const target&, match_data&) const;
 
       target_state
-      perform_clean (action, const target&) const;
+      perform_clean (action, const target&, match_data&) const;
 
-      using simple_rule::match; // To make Clang happy.
+      virtual const target*
+      import (const prerequisite_key&,
+              const optional<string>&,
+              const location&) const override;
 
     public:
       // Library handling.
@@ -228,9 +233,9 @@ namespace build2
       static void
       functions (function_family&, const char*); // functions.cxx
 
-    private:
-      friend class install_rule;
-      friend class libux_install_rule;
+      // Implementation details.
+      //
+    public:
 
       // Shared library paths.
       //
@@ -273,6 +278,9 @@ namespace build2
 
       struct match_data
       {
+        explicit
+        match_data (const link_rule& r): rule (r) {}
+
         // The "for install" condition is signalled to us by install_rule when
         // it is matched for the update operation. It also verifies that if we
         // have already been executed, then it was for install.
@@ -307,10 +315,21 @@ namespace build2
         size_t start; // Parallel prerequisites/prerequisite_targets start.
 
         link_rule::libs_paths libs_paths;
+
+        const link_rule& rule;
+
+        target_state
+        operator() (action a, const target& t)
+        {
+          return a == perform_update_id
+            ? rule.perform_update (a, t, *this)
+            : rule.perform_clean (a, t, *this);
+        }
       };
 
       // Windows rpath emulation (windows-rpath.cxx).
       //
+     private:
       struct windows_dll
       {
         reference_wrapper<const string> dll;