From 8d1735e04faadaa6765c71b12a96188e6d56c9fa Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Wed, 14 Feb 2018 12:27:11 +0200
Subject: Don't ignore objX{} and bmiX{} prerequisites in cc::link_rule

---
 build2/cc/link-rule.cxx | 30 ++++++++++++++----------------
 1 file changed, 14 insertions(+), 16 deletions(-)

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

diff --git a/build2/cc/link-rule.cxx b/build2/cc/link-rule.cxx
index cd355c6..c59597a 100644
--- a/build2/cc/link-rule.cxx
+++ b/build2/cc/link-rule.cxx
@@ -630,12 +630,15 @@ namespace build2
           //
           else
           {
-            // @@ Temporary hack until we get the default outer operation for
-            // update. This allows operations like test and install to skip
-            // such tacked on stuff.
-            //
-            if (current_outer_oif != nullptr)
-              continue;
+            if (!p.is_a<objx> () && !p.is_a<bmix> ())
+            {
+              // @@ Temporary hack until we get the default outer operation
+              // for update. This allows operations like test and install to
+              // skip such tacked on stuff.
+              //
+              if (current_outer_oif != nullptr)
+                continue;
+            }
 
             pt = &p.search (t);
           }
@@ -792,8 +795,7 @@ namespace build2
               if (p1.is_a<fsdir> ()                                         ||
                   p1.is_a<libx>  ()                                         ||
                   p1.is_a<liba> () || p1.is_a<libs> () || p1.is_a<libux> () ||
-                  p1.is_a<bmi>  ()                                          ||
-                  p1.is_a<bmie> () || p1.is_a<bmia> () || p1.is_a<bmis> ()  ||
+                  p1.is_a<bmi>  () || p1.is_a<bmix> ()                      ||
                   (p.is_a (mod ? *x_mod : x_src) && x_header (p1))          ||
                   (p.is_a<c> () && p1.is_a<h> ()))
                 continue;
@@ -1555,16 +1557,14 @@ namespace build2
           //
           if (modules)
           {
-            if (pt->is_a<bmie> () || pt->is_a<bmia> () || pt->is_a<bmis> ())
+            if (pt->is_a<bmix> ())
               pt = pt->member;
           }
 
           const file* f;
           bool la (false), ls (false);
 
-          if ((f = pt->is_a<obje> ()) ||
-              (f = pt->is_a<obja> ()) ||
-              (f = pt->is_a<objs> ()) ||
+          if ((f = pt->is_a<objx> ()) ||
               (!lt.static_library () && // @@ UTL: TODO libua to liba link.
                ((la = (f = pt->is_a<liba>  ())) ||
                 (la = (f = pt->is_a<libux> ())) ||
@@ -1841,16 +1841,14 @@ namespace build2
 
         if (modules)
         {
-          if (pt->is_a<bmie> () || pt->is_a<bmia> () || pt->is_a<bmis> ())
+          if (pt->is_a<bmix> ())
             pt = pt->member;
         }
 
         const file* f;
         bool la (false), ls (false);
 
-        if ((f = pt->is_a<obje> ()) ||
-            (f = pt->is_a<obja> ()) ||
-            (f = pt->is_a<objs> ()) ||
+        if ((f = pt->is_a<objx> ()) ||
             (!lt.static_library () && // @@ UTL: TODO libua to liba link.
              ((la = (f = pt->is_a<liba>  ())) ||
               (la = (f = pt->is_a<libux> ())) ||
-- 
cgit v1.1