aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2018-06-09 17:54:06 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2018-06-09 17:54:06 +0200
commit1898c3d67ef4cc5e7ec466aab4ca41ce32ad2f0d (patch)
tree02dcb7841a9ab8a3dae78b13e33031d11886ea5a
parent081da576f6252943de177f7c21b9b7ec5f9218f4 (diff)
Minor diagnostics improvement
-rw-r--r--build2/cc/link-rule.cxx7
1 files changed, 6 insertions, 1 deletions
diff --git a/build2/cc/link-rule.cxx b/build2/cc/link-rule.cxx
index a6294bf..4e7ca9a 100644
--- a/build2/cc/link-rule.cxx
+++ b/build2/cc/link-rule.cxx
@@ -994,7 +994,10 @@ namespace build2
// Searching our own prerequisite is ok, p1 must already be
// resolved.
//
- if (&p.search (t) != &p1.search (*pt))
+ const target& tp (p.search (t));
+ const target& tp1 (p1.search (*pt));
+
+ if (&tp != &tp1)
{
bool group (!p.prerequisite.belongs (t));
@@ -1006,6 +1009,8 @@ namespace build2
<< "would be incompatible with existing target " << *pt <<
info << "existing prerequisite " << p1 << " does not match "
<< p <<
+ info << p1 << " resolves to target " << tp1 <<
+ info << p << " resolves to target " << tp <<
info << "specify corresponding " << rtt.name << "{} "
<< "dependency explicitly";
}