diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2017-02-15 03:55:15 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2017-03-02 14:03:34 +0200 |
| commit | b37f1aa6398065be806e6605a023189685669885 (patch) | |
| tree | b9b32091e3d70a31852302b24c99ecb62465464a /build2/cc/pkgconfig.cxx | |
| parent | a64b2ae2099346471ead988d5f2d383d55a9bf89 (diff) | |
Implement parallel match
Diffstat (limited to 'build2/cc/pkgconfig.cxx')
| -rw-r--r-- | build2/cc/pkgconfig.cxx | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/build2/cc/pkgconfig.cxx b/build2/cc/pkgconfig.cxx index da6614f..72ae31b 100644 --- a/build2/cc/pkgconfig.cxx +++ b/build2/cc/pkgconfig.cxx @@ -37,7 +37,8 @@ namespace build2 // search_library() POV. // bool common:: - pkgconfig_extract (const scope& s, + pkgconfig_extract (action act, + const scope& s, lib& lt, liba* at, libs* st, @@ -256,7 +257,7 @@ namespace build2 // Now parse --libs into loptions/libs (interface and implementation). // - auto parse_libs = [&s, &f, sysd, &next, this] ( + auto parse_libs = [act, &s, &f, sysd, &next, this] ( const string& lstr, target& t) { strings lops; @@ -421,7 +422,8 @@ namespace build2 prerequisite_key pk { nullopt, {&lib::static_type, &out, &out, &name, nullopt}, &s}; - if (lib* lt = static_cast<lib*> (search_library (sysd, usrd, pk))) + if (lib* lt = static_cast<lib*> ( + search_library (act, sysd, usrd, pk))) { // We used to pick a member but that doesn't seem right since the // same target could be used with different link orders. |