aboutsummaryrefslogtreecommitdiff
path: root/build2/cc/pkgconfig.cxx
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2018-11-02 12:21:42 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2018-11-02 12:21:42 +0200
commit009e3bdd4743fb6bb74334ec5567f43830df1722 (patch)
tree5dc72aedca8fdaa854d65801b91f9a12ea99a4e0 /build2/cc/pkgconfig.cxx
parent9bbdade4a502f72d1d5a25d6ace2f6545c2658b0 (diff)
Use rule-specific variables for module name set on bmi*{} targets
Diffstat (limited to 'build2/cc/pkgconfig.cxx')
-rw-r--r--build2/cc/pkgconfig.cxx7
1 files changed, 6 insertions, 1 deletions
diff --git a/build2/cc/pkgconfig.cxx b/build2/cc/pkgconfig.cxx
index 79cd7bc..1630076 100644
--- a/build2/cc/pkgconfig.cxx
+++ b/build2/cc/pkgconfig.cxx
@@ -1077,6 +1077,11 @@ namespace build2
// exist but for a "different purpose" (e.g., it could be used as
// a header).
//
+ // @@ Could setting it in the rule-specific vars help? (But we
+ // are not matching a rule for it.) Note that we are setting
+ // it on the module source, not bmi*{}! So rule-specific vars
+ // don't seem to the answer here.
+ //
if (tl.second.owns_lock ())
{
mt.vars.assign (c_module_name) = move (mn);
@@ -1486,7 +1491,7 @@ namespace build2
modules.push_back (
module {
- cast<string> (pt->vars[c_module_name]),
+ cast<string> (pt->state[a].vars[c_module_name]),
move (p),
move (pp),
symexport