aboutsummaryrefslogtreecommitdiff
path: root/libbuild2/cc
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2023-12-13 12:29:02 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2023-12-13 12:29:02 +0200
commiteb9e8b2083de81b49284a907607c7ef380cf9f8a (patch)
treeeb1d59eec176f278243eb1bc5de5ec076de2c5a9 /libbuild2/cc
parent30e5f6677c6ad8246419b2392791f2664d48bf05 (diff)
Fix another instance of module name not being assigned due to deferred failure
Diffstat (limited to 'libbuild2/cc')
-rw-r--r--libbuild2/cc/compile-rule.cxx27
1 files changed, 17 insertions, 10 deletions
diff --git a/libbuild2/cc/compile-rule.cxx b/libbuild2/cc/compile-rule.cxx
index d40638c..e993048 100644
--- a/libbuild2/cc/compile-rule.cxx
+++ b/libbuild2/cc/compile-rule.cxx
@@ -6070,10 +6070,18 @@ namespace build2
//
if (pt->is_a<bmix> ())
{
- const string& n (cast<string> (pt->state[a].vars[c_module_name]));
-
- if (const target** p = check_exact (n))
- *p = pt;
+ // If the extraction of the module information for this BMI failed
+ // and we have deferred failure to compiler diagnostics, then
+ // there will be no module name assigned. It would have been
+ // better to make sure that's the cause, but that won't be easy.
+ //
+ const string* n (cast_null<string> (
+ pt->state[a].vars[c_module_name]));
+ if (n != nullptr)
+ {
+ if (const target** p = check_exact (*n))
+ *p = pt;
+ }
}
else if (pt->is_a (*x_mod))
{
@@ -6082,7 +6090,8 @@ namespace build2
// rule puts them into prerequisite_targets for us).
//
// The module names should be specified but if not assume
- // something else is going on and ignore.
+ // something else is going on (like a deferred failure) and
+ // ignore.
//
// Note also that besides modules, prerequisite_targets may
// contain libraries which are interface dependencies of this
@@ -6476,12 +6485,10 @@ namespace build2
if (m.score <= match_max (in))
{
- // If the extraction of the module information for this BMI failed
- // and we have deferred failure to compiler diagnostics, then there
- // will be no module name assigned. It would have been better to
- // make sure that's the cause, but that won't be easy.
+ // As above (deffered failure).
//
- const string* mn (cast_null<string> (bt->state[a].vars[c_module_name]));
+ const string* mn (
+ cast_null<string> (bt->state[a].vars[c_module_name]));
if (mn != nullptr && in != *mn)
{