From d1fbcace59846d55c66e741dbc3d59e20ae3e5cf Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Wed, 26 Jun 2019 12:28:05 +0200
Subject: Fix C/C++ link rule matching ambiguity by seeing-through utility
 libraries

---
 build2/cc/compile-rule.cxx | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

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

diff --git a/build2/cc/compile-rule.cxx b/build2/cc/compile-rule.cxx
index 1ea3800..a1796eb 100644
--- a/build2/cc/compile-rule.cxx
+++ b/build2/cc/compile-rule.cxx
@@ -384,7 +384,7 @@ namespace build2
         if (const target* pt = p.load ())
         {
           if (const libx* l = pt->is_a<libx> ())
-            pt = &link_member (*l, a, li);
+            pt = link_member (*l, a, li);
 
           bool la;
           if (!((la = pt->is_a<liba> ())  ||
@@ -435,7 +435,7 @@ namespace build2
         if (const target* pt = p.load ())
         {
           if (const libx* l = pt->is_a<libx> ())
-            pt = &link_member (*l, a, li);
+            pt = link_member (*l, a, li);
 
           bool la;
           if (!((la = pt->is_a<liba> ())  ||
@@ -489,7 +489,7 @@ namespace build2
         if (const target* pt = p.load ())
         {
           if (const libx* l = pt->is_a<libx> ())
-            pt = &link_member (*l, a, li);
+            pt = link_member (*l, a, li);
 
           bool la;
           if (!((la = pt->is_a<liba> ())  ||
@@ -741,7 +741,7 @@ namespace build2
             pt = &p.search (t);
 
             if (const libx* l = pt->is_a<libx> ())
-              pt = &link_member (*l, a, li);
+              pt = link_member (*l, a, li);
           }
           else
             continue;
@@ -4713,7 +4713,7 @@ namespace build2
           const target* lt (nullptr);
 
           if (const libx* l = pt->is_a<libx> ())
-            lt = &link_member (*l, a, li);
+            lt = link_member (*l, a, li);
           else if (pt->is_a<liba> () || pt->is_a<libs> () || pt->is_a<libux> ())
             lt = pt;
 
-- 
cgit v1.1