aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2019-07-11 14:01:38 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2019-07-11 14:01:38 +0200
commita461d493eb9955f5c34389a2a4dd6a1b21b20fb4 (patch)
tree074315f8e0c7103cba4c8522629e87bf18334ad7
parent71153a8d938fd1eab9c5b8dbdfece1ea94549d2e (diff)
Improve diagnostics
-rw-r--r--build2/cc/compile-rule.cxx9
1 files changed, 5 insertions, 4 deletions
diff --git a/build2/cc/compile-rule.cxx b/build2/cc/compile-rule.cxx
index 147b3fe..41782b3 100644
--- a/build2/cc/compile-rule.cxx
+++ b/build2/cc/compile-rule.cxx
@@ -1367,7 +1367,7 @@ namespace build2
else if (v.priority <= prio)
{
if (verb >= 4)
- trace << "ignoring dependency prefix " << p << '\n'
+ trace << "ignoring mapping for prefix '" << p << "'\n"
<< " existing mapping to " << v.directory
<< " priority " << v.priority << '\n'
<< " another mapping to " << d
@@ -1376,7 +1376,7 @@ namespace build2
else
{
if (verb >= 4)
- trace << "overriding dependency prefix " << p << '\n'
+ trace << "overriding mapping for prefix '" << p << "'\n"
<< " existing mapping to " << v.directory
<< " priority " << v.priority << '\n'
<< " new mapping to " << d
@@ -1388,7 +1388,8 @@ namespace build2
}
else
{
- l6 ([&]{trace << p << " -> " << d << " priority " << prio;});
+ l6 ([&]{trace << "'" << p << "' -> " << d << " priority "
+ << prio;});
m.emplace (move (p), prefix_value {move (d), prio});
}
};
@@ -1401,7 +1402,7 @@ namespace build2
// the competing -I paths is a subdirectory of another. But the
// proper solution will be to keep all the prefixless entries (by
// changing prefix_map to a multimap) since for them we have an
- // extra checks (target must be explicitly spelled out in a
+ // extra check (target must be explicitly spelled out in a
// buildfile).
//
for (size_t prio (0);; ++prio)