From 635f75c7b3fbb6053059827c73a4df52733850e0 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Thu, 11 Feb 2021 09:08:55 +0200 Subject: Generalize process_libraries() to allow no picking installed library member --- libbuild2/cc/pkgconfig.cxx | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'libbuild2/cc/pkgconfig.cxx') diff --git a/libbuild2/cc/pkgconfig.cxx b/libbuild2/cc/pkgconfig.cxx index 48219f2..d44b0ec 100644 --- a/libbuild2/cc/pkgconfig.cxx +++ b/libbuild2/cc/pkgconfig.cxx @@ -1633,15 +1633,15 @@ namespace build2 // pretty similar to link_rule::append_libraries()). // bool priv (false); - auto imp = [&priv] (const file&, bool la) {return priv && la;}; + auto imp = [&priv] (const target&, bool la) {return priv && la;}; auto lib = [&save_library_target, - &save_library_name] (const file* const* c, + &save_library_name] (const target* const* lc, const string& p, lflags, bool) { - const file* l (c != nullptr ? *c : nullptr); + const file* l (lc != nullptr ? &(*lc)->as () : nullptr); if (l != nullptr) { @@ -1652,9 +1652,7 @@ namespace build2 save_library_name (p); // Something "system'y", save as is. }; - auto opt = [] (const file&, - const string&, - bool, bool) + auto opt = [] (const target&, const string&, bool, bool) { //@@ TODO: should we filter -L similar to -I? //@@ TODO: how will the Libs/Libs.private work? -- cgit v1.1