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/windows-rpath.cxx | |
parent | 76a4655da2bf544acc65a9cd000c8889cbe763b0 (diff) |
Generalize process_libraries() to allow no picking installed library member
Diffstat (limited to 'libbuild2/cc/windows-rpath.cxx')
-rw-r--r-- | libbuild2/cc/windows-rpath.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libbuild2/cc/windows-rpath.cxx b/libbuild2/cc/windows-rpath.cxx index eddb9c4..70eef73 100644 --- a/libbuild2/cc/windows-rpath.cxx +++ b/libbuild2/cc/windows-rpath.cxx @@ -56,14 +56,14 @@ namespace build2 // We need to collect all the DLLs, so go into implementation of both // shared and static (in case they depend on shared). // - auto imp = [] (const file&, bool) {return true;}; + auto imp = [] (const target&, bool) {return true;}; - auto lib = [&r] (const file* const* lc, + auto lib = [&r] (const target* const* lc, const string& f, lflags, bool sys) { - const file* l (lc != nullptr ? *lc : nullptr); + const file* l (lc != nullptr ? &(*lc)->as<file> () : nullptr); // We don't rpath system libraries. // @@ -137,14 +137,14 @@ namespace build2 { windows_dlls r; - auto imp = [] (const file&, bool) {return true;}; + auto imp = [] (const target&, bool) {return true;}; - auto lib = [&r, &bs] (const file* const* lc, + auto lib = [&r, &bs] (const target* const* lc, const string& f, lflags, bool sys) { - const file* l (lc != nullptr ? *lc : nullptr); + const file* l (lc != nullptr ? &(*lc)->as<file> () : nullptr); if (sys) return; |