aboutsummaryrefslogtreecommitdiff
path: root/build2/cc/init.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'build2/cc/init.cxx')
-rw-r--r--build2/cc/init.cxx7
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;