1 files changed, 45 insertions, 27 deletions

diff --git a/libbuild2/cc/install-rule.cxx b/libbuild2/cc/install-rule.cxx
index 560b8a7..dae65db 100644
--- a/libbuild2/cc/install-rule.cxx
+++ b/libbuild2/cc/install-rule.cxx
@@ -90,14 +90,16 @@ namespace build2
       {
         return (x_header (p)   ||
                 p.is_a (x_src) ||
-                (x_mod != nullptr && p.is_a (*x_mod)));
+                (x_mod != nullptr && p.is_a (*x_mod)) ||
+                (x_asp != nullptr && p.is_a (*x_asp)) ||
+                (x_obj != nullptr && p.is_a (*x_obj)));
       };
 
       if (t.is_a<exe> ())
       {
         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,17 +153,29 @@ 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);
     }
 
+    // Wrap the file_rule's recipe into a data-carrying recipe.
+    //
+    struct install_match_data
+    {
+      build2::recipe        recipe;
+      link_rule::libs_paths libs_paths;
+
+      target_state
+      operator() (action a, const target& t)
+      {
+        return recipe (a, t);
+      }
+    };
+
     recipe install_rule::
     apply (action a, target& t) const
     {
@@ -175,7 +189,7 @@ namespace build2
         // Signal to the link rule that this is update for install. And if the
         // update has already been executed, verify it was done for install.
         //
-        auto& md (t.data<link_rule::match_data> ());
+        auto& md (t.data<link_rule::match_data> (a.inner_action ()));
 
         if (md.for_install)
         {
@@ -194,19 +208,18 @@ namespace build2
         // storage if we are un/installing (used in the *_extra() functions
         // below).
         //
-        static_assert (sizeof (link_rule::libs_paths) <= target::data_size,
-                       "insufficient space");
-
         if (file* f = t.is_a<libs> ())
         {
           if (!f->path ().empty ()) // Not binless.
           {
             const string* p (cast_null<string> (t["bin.lib.prefix"]));
             const string* s (cast_null<string> (t["bin.lib.suffix"]));
-            t.data (
+
+            return install_match_data {
+              move (r),
               link_.derive_libs_paths (*f,
                                        p != nullptr ? p->c_str (): nullptr,
-                                       s != nullptr ? s->c_str (): nullptr));
+                                       s != nullptr ? s->c_str (): nullptr)};
           }
         }
       }
@@ -224,11 +237,11 @@ namespace build2
         // Here we may have a bunch of symlinks that we need to install.
         //
         const scope& rs (t.root_scope ());
-        auto& lp (t.data<link_rule::libs_paths> ());
+        auto& lp (t.data<install_match_data> (perform_install_id).libs_paths);
 
-        auto ln = [&rs, &id] (const path& f, const path& l)
+        auto ln = [&t, &rs, &id] (const path& f, const path& l)
         {
-          install_l (rs, id, f.leaf (), l.leaf (), 2 /* verbosity */);
+          install_l (rs, id, l.leaf (), t, f.leaf (), 2 /* verbosity */);
           return true;
         };
 
@@ -258,11 +271,11 @@ namespace build2
         // Here we may have a bunch of symlinks that we need to uninstall.
         //
         const scope& rs (t.root_scope ());
-        auto& lp (t.data<link_rule::libs_paths> ());
+        auto& lp (t.data<install_match_data> (perform_uninstall_id).libs_paths);
 
-        auto rm = [&rs, &id] (const path& l)
+        auto rm = [&rs, &id] (const path& f, const path& l)
         {
-          return uninstall_f (rs, id, nullptr, l.leaf (), 2 /* verbosity */);
+          return uninstall_l (rs, id, l.leaf (), f.leaf (), 2 /* verbosity */);
         };
 
         const path& lk (lp.link);
@@ -270,10 +283,12 @@ namespace build2
         const path& so (lp.soname);
         const path& in (lp.interm);
 
-        if (!lk.empty ()) r = rm (lk) || r;
-        if (!ld.empty ()) r = rm (ld) || r;
-        if (!so.empty ()) r = rm (so) || r;
-        if (!in.empty ()) r = rm (in) || r;
+        const path* f (lp.real);
+
+        if (!in.empty ()) {r = rm (*f, in) || r; f = &in;}
+        if (!so.empty ()) {r = rm (*f, so) || r; f = &so;}
+        if (!ld.empty ()) {r = rm (*f, ld) || r; f = &ld;}
+        if (!lk.empty ()) {r = rm (*f, lk) || r;         }
       }
 
       return r;
@@ -325,14 +340,16 @@ namespace build2
       {
         return (x_header (p)   ||
                 p.is_a (x_src) ||
-                (x_mod != nullptr && p.is_a (*x_mod)));
+                (x_mod != nullptr && p.is_a (*x_mod)) ||
+                (x_asp != nullptr && p.is_a (*x_asp)) ||
+                (x_obj != nullptr && p.is_a (*x_obj)));
       };
 
       if (t.is_a<libue> ())
       {
         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 +389,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);
     }
   }
 }