diff options
author | Boris Kolpackov <boris@codesynthesis.com> | 2016-08-28 06:31:47 +0200 |
---|---|---|
committer | Boris Kolpackov <boris@codesynthesis.com> | 2016-08-28 06:31:47 +0200 |
commit | d3c5559f9d0969ec91ed0113223b2ec18e53c9ff (patch) | |
tree | c03212c0b567767446798d0df9cb59d683d6d0b8 /build2/cc/compile | |
parent | 457f83ee501ba8f9a6a576de741e43ff9dfef039 (diff) |
Extract pkg-config information for both static/shared at once
We also no longer pick shared/static file rather entering them as "our" lib{}
target. This way we use the link order of the importer "transitively".
Diffstat (limited to 'build2/cc/compile')
-rw-r--r-- | build2/cc/compile | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/build2/cc/compile b/build2/cc/compile index 5bff6b1..6c00b73 100644 --- a/build2/cc/compile +++ b/build2/cc/compile @@ -42,10 +42,10 @@ namespace build2 private: void - append_lib_options (cstrings&, target&) const; + append_lib_options (cstrings&, target&, scope&, lorder) const; void - hash_lib_options (sha256&, target&) const; + hash_lib_options (sha256&, target&, scope&, lorder) const; // Mapping of include prefixes (e.g., foo in <foo/bar>) for auto- // generated headers to directories where they will be generated. @@ -63,10 +63,10 @@ namespace build2 append_prefixes (prefix_map&, target&, const variable&) const; void - append_lib_prefixes (prefix_map&, target&) const; + append_lib_prefixes (prefix_map&, target&, scope&, lorder) const; prefix_map - build_prefix_map (target&, lorder) const; + build_prefix_map (target&, scope&, lorder) const; // Reverse-lookup target type from extension. // |