From d1fbcace59846d55c66e741dbc3d59e20ae3e5cf Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Wed, 26 Jun 2019 12:28:05 +0200 Subject: Fix C/C++ link rule matching ambiguity by seeing-through utility libraries --- build2/cc/install-rule.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'build2/cc/install-rule.cxx') diff --git a/build2/cc/install-rule.cxx b/build2/cc/install-rule.cxx index 00e8a63..5f8722b 100644 --- a/build2/cc/install-rule.cxx +++ b/build2/cc/install-rule.cxx @@ -57,7 +57,7 @@ namespace build2 // link. For libu*{} we want the "see through" logic. // if (const libx* l = pt->is_a ()) - pt = &link_member (*l, a, link_info (t.base_scope (), ot)); + pt = link_member (*l, a, link_info (t.base_scope (), ot)); // Note: not redundant since we are returning a member. // @@ -285,7 +285,7 @@ namespace build2 const target* pt (&search (t, p)); if (const libx* l = pt->is_a ()) - pt = &link_member (*l, a, link_info (t.base_scope (), ot)); + pt = link_member (*l, a, link_info (t.base_scope (), ot)); if ((st && pt->is_a ()) || (at && pt->is_a ())) return pt->in (t.weak_scope ()) ? pt : nullptr; -- cgit v1.1