From d503f45ab1b5ee91425dc89cd1b72e7239fa5f10 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Mon, 4 Dec 2017 14:42:31 +0200
Subject: Improve cc/bin target mismatch diagnostics

---
 build2/bin/init.cxx |  2 +-
 build2/cc/init.cxx  | 10 +++++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/build2/bin/init.cxx b/build2/bin/init.cxx
index e145a23..ef4b3df 100644
--- a/build2/bin/init.cxx
+++ b/build2/bin/init.cxx
@@ -223,7 +223,7 @@ namespace build2
           auto p (omitted (rs, var));
           lookup l (p.first);
 
-          // Then see if there is a config hint (e.g., from the C++ module).
+          // Then see if there is a config hint (e.g., from the cc module).
           //
           bool hint (false);
           if (!l)
diff --git a/build2/cc/init.cxx b/build2/cc/init.cxx
index 7a3e99e..b2cb2b3 100644
--- a/build2/cc/init.cxx
+++ b/build2/cc/init.cxx
@@ -280,9 +280,13 @@ namespace build2
         const auto& bt (cast<target_triplet> (rs["bin.target"]));
 
         if (bt != ct)
-          fail (loc) << "cc and bin module target mismatch" <<
-            info << "cc.target is " << ct <<
-            info << "bin.target is " << bt;
+        {
+          const auto& h (cast<string> (rs["cc.hinter"]));
+
+          fail (loc) << h << " and bin module target mismatch" <<
+            info << h << " target is " << ct <<
+            info << "bin target is " << bt;
+        }
       }
 
       const string& cid (cast<string> (rs["cc.id"]));
-- 
cgit v1.1