diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2021-02-11 09:08:55 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2021-02-11 09:08:55 +0200 |
| commit | 635f75c7b3fbb6053059827c73a4df52733850e0 (patch) | |
| tree | 3e1734b7edfd3c370aead2002d1bed416f2a551b /libbuild2/cc/pkgconfig.cxx | |
| parent | 76a4655da2bf544acc65a9cd000c8889cbe763b0 (diff) | |
Generalize process_libraries() to allow no picking installed library member
Diffstat (limited to 'libbuild2/cc/pkgconfig.cxx')
| -rw-r--r-- | libbuild2/cc/pkgconfig.cxx | 10 |
1 files changed, 4 insertions, 6 deletions
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<file> () : 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? |