diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2016-08-27 10:57:52 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2016-08-27 10:57:52 +0200 |
| commit | 89fede9383cb97af36430531fb59aaf12dc98543 (patch) | |
| tree | d03bbe8575c0a23dc1e7dbb1fddf4b5da8426646 /build2/cc/link | |
| parent | a4796d5b851dac4a546f89c282f65e320076eb10 (diff) | |
Determine if library is system in process_libraries
Diffstat (limited to 'build2/cc/link')
| -rw-r--r-- | build2/cc/link | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/build2/cc/link b/build2/cc/link index 09678c2..84edd36 100644 --- a/build2/cc/link +++ b/build2/cc/link @@ -44,7 +44,7 @@ namespace build2 file&, bool, bool, - const function<void (const path&)>&, + const function<void (const path&, bool)>&, const function<void (file&, const string&, bool, @@ -55,7 +55,7 @@ namespace build2 void hash_libraries (sha256&, file&, bool) const; - file& + pair<reference_wrapper<file>, optional<bool>> resolve_library (name, scope&, lorder, @@ -93,7 +93,7 @@ namespace build2 lorder lo) const { if (p.target == nullptr) // First check the cache. - p.target = search_library (sysd, usrd, p.key (), lo); + p.target = search_library (sysd, usrd, p.key (), lo, nullptr); return p.target; } @@ -102,7 +102,8 @@ namespace build2 search_library (const dir_paths&, optional<dir_paths>&, const prerequisite_key&, - lorder) const; + lorder, + bool* sys) const; // Windows-specific (windows-manifest.cxx). // |