From ad770fe609d1958a64e7364861296ac5407611d9 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Mon, 4 Dec 2017 12:42:09 +0200
Subject: Improve diagnostics when c-family modules using different toolchains

We now also warn on toolchain pattern mismatch.
---
 build2/cc/init.cxx | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'build2/cc/init.cxx')

diff --git a/build2/cc/init.cxx b/build2/cc/init.cxx
index 90821ae..7a3e99e 100644
--- a/build2/cc/init.cxx
+++ b/build2/cc/init.cxx
@@ -96,6 +96,7 @@ namespace build2
       // Hint variables (not overridable).
       //
       v.insert<string>         ("config.cc.id");
+      v.insert<string>         ("config.cc.hinter"); // Hinting module.
       v.insert<string>         ("config.cc.pattern");
       v.insert<target_triplet> ("config.cc.target");
 
@@ -156,12 +157,14 @@ namespace build2
       if (!cast_false<bool> (rs["cc.core.vars.loaded"]))
         load_module (rs, rs, "cc.core.vars", loc);
 
-      // config.cc.id
+      // config.cc.{id,hinter}
       //
       {
-        // This value must be hinted.
+        // These values must be hinted.
         //
         rs.assign<string> ("cc.id") = cast<string> (hints["config.cc.id"]);
+        rs.assign<string> ("cc.hinter") =
+          cast<string> (hints["config.cc.hinter"]);
       }
 
       // config.cc.target
@@ -188,8 +191,8 @@ namespace build2
       {
         // This value could be hinted.
         //
-        if (auto l = hints["config.cc.pattern"])
-          rs.assign<string> ("cc.pattern") = cast<string> (l);
+        rs.assign<string> ("cc.pattern") =
+          cast_empty<string> (hints["config.cc.pattern"]);
       }
 
       return true;
-- 
cgit v1.1