diff options
author | Boris Kolpackov <boris@codesynthesis.com> | 2017-07-31 18:42:47 +0200 |
---|---|---|
committer | Boris Kolpackov <boris@codesynthesis.com> | 2017-07-31 18:44:07 +0200 |
commit | a84ff43b183181e0a12c6d5e31c1f366d39ce2fe (patch) | |
tree | 3dce54b64fd8e9917ed034a3e2c9e20f057eece4 /build2/cc/init.cxx | |
parent | 89f5bc3b423a1269a60ccca05174226c8de40357 (diff) |
Experimental (and probably broken) pkg-config generation support
Diffstat (limited to 'build2/cc/init.cxx')
-rw-r--r-- | build2/cc/init.cxx | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/build2/cc/init.cxx b/build2/cc/init.cxx index ea42469..8dceda7 100644 --- a/build2/cc/init.cxx +++ b/build2/cc/init.cxx @@ -248,14 +248,15 @@ namespace build2 load_module (rs, rs, "bin.rc.config", loc); } - // Load (optionally) the pkgconfig.config module. + // Load (optionally) the pkgconfig module. Note that it registers the + // pc{} target whether the pkg-config utility is found or not. // // @@ At some point we may also want to verify that targets matched // if it has already been loaded (by someone) else. Currently it // doesn't set pkgconfig.target. Perhaps only set if it was used // to derive the program name? // - if (!cast_false<bool> (rs["pkgconfig.config.loaded"])) + if (!cast_false<bool> (rs["pkgconfig.loaded"])) { // Prepare configuration hints. // @@ -266,7 +267,7 @@ namespace build2 const variable& t (vp.insert ("config.pkgconfig.target")); h.assign (t) = cast<target_triplet> (rs["cc.target"]); - load_module (rs, rs, "pkgconfig.config", loc, true, h); + load_module (rs, rs, "pkgconfig", loc, true, h); } return true; |