From 51ab0a979c5c53defd5eda9fa997b2abfd0d4f7d Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Thu, 16 Jul 2020 09:05:04 +0200
Subject: Save original compiler path/mode in {c,cxx}.config.path/mode

It turns out that when propagating {c,cxx}.config in tests we don't want to
propagate any options (such as *.std) that have been folded into our project's
mode.
---
 libbuild2/cc/init.cxx | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

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

diff --git a/libbuild2/cc/init.cxx b/libbuild2/cc/init.cxx
index 040df7f..6791190 100644
--- a/libbuild2/cc/init.cxx
+++ b/libbuild2/cc/init.cxx
@@ -185,18 +185,18 @@ namespace build2
 
       // config.cc.{id,hinter}
       //
+      // These values must be hinted.
+      //
       {
-        // These values must be hinted.
-        //
         rs.assign<string> ("cc.id") = cast<string> (h["config.cc.id"]);
         rs.assign<string> ("cc.hinter") = cast<string> (h["config.cc.hinter"]);
       }
 
       // config.cc.target
       //
+      // This value must be hinted.
+      //
       {
-        // This value must be hinted.
-        //
         const auto& t (cast<target_triplet> (h["config.cc.target"]));
 
         // Also enter as cc.target.{cpu,vendor,system,version,class} for
@@ -213,18 +213,18 @@ namespace build2
 
       // config.cc.pattern
       //
+      // This value could be hinted. Note that the hints may not be the same.
+      //
       {
-        // This value could be hinted.
-        //
         rs.assign<string> ("cc.pattern") =
           cast_empty<string> (h["config.cc.pattern"]);
       }
 
       // config.cc.mode
       //
+      // This value could be hinted. Note that the hints may not be the same.
+      //
       {
-        // This value could be hinted.
-        //
         rs.assign<strings> ("cc.mode") =
           cast_empty<strings> (h["config.cc.mode"]);
       }
-- 
cgit v1.1