Rename cxx.host.* to cxx.target.*

3 files changed, 12 insertions, 12 deletions

diff --git a/build2/cxx/compile.cxx b/build2/cxx/compile.cxx
index 2b37250..3cd4b9d 100644
--- a/build2/cxx/compile.cxx
+++ b/build2/cxx/compile.cxx
@@ -131,7 +131,7 @@ namespace build2
       if (a == perform_update_id)
       {
         scope& rs (t.root_scope ());
-        const string& sys (as<string> (*rs["cxx.host.system"]));
+        const string& sys (as<string> (*rs["cxx.target.system"]));
 
         // The cached prerequisite target should be the same as what is in
         // t.prerequisite_targets since we used standard search() and match()
@@ -463,7 +463,7 @@ namespace build2
       auto init_args = [&t, &s, &rs, &args, &cxx_std] ()
       {
         const string& cxx (as<string> (*rs["config.cxx"]));
-        const string& sys (as<string> (*rs["cxx.host.system"]));
+        const string& sys (as<string> (*rs["cxx.target.system"]));
 
         args.push_back (cxx.c_str ());
 
@@ -925,7 +925,7 @@ namespace build2
 
       scope& rs (t.root_scope ());
       const string& cxx (as<string> (*rs["config.cxx"]));
-      const string& sys (as<string> (*rs["cxx.host.system"]));
+      const string& sys (as<string> (*rs["cxx.target.system"]));
 
       cstrings args {cxx.c_str ()};
 
diff --git a/build2/cxx/link.cxx b/build2/cxx/link.cxx
index d8b675b..16948b2 100644
--- a/build2/cxx/link.cxx
+++ b/build2/cxx/link.cxx
@@ -221,7 +221,7 @@ namespace build2
         return p.target;
 
       scope& rs (*p.scope.root_scope ());
-      const string& sys (as<string> (*rs["cxx.host.system"]));
+      const string& sys (as<string> (*rs["cxx.target.system"]));
 
       bool l (p.is_a<lib> ());
       const string* ext (l ? nullptr : p.ext); // Only for liba/libso.
@@ -486,7 +486,7 @@ namespace build2
       path_target& t (static_cast<path_target&> (xt));
 
       scope& rs (t.root_scope ());
-      const string& sys (as<string> (*rs["cxx.host.system"]));
+      const string& sys (as<string> (*rs["cxx.target.system"]));
 
       type lt (link_type (t));
       bool so (lt == type::so);
@@ -758,7 +758,7 @@ namespace build2
       bool up (execute_prerequisites (a, t, t.mtime ()));
 
       scope& rs (t.root_scope ());
-      const string& sys (as<string> (*rs["cxx.host.system"]));
+      const string& sys (as<string> (*rs["cxx.target.system"]));
 
       // Check/update the dependency database.
       //
diff --git a/build2/cxx/module.cxx b/build2/cxx/module.cxx
index 53c1bc7..939cdfe 100644
--- a/build2/cxx/module.cxx
+++ b/build2/cxx/module.cxx
@@ -220,13 +220,13 @@ namespace build2
 
           l5 ([&]{trace << "canonical target '" << canon << "'";});
 
-          // Enter as cxx.host.{cpu,vendor,system,version}.
+          // Enter as cxx.target.{cpu,vendor,system,version}.
           //
-          r.assign ("cxx.host", string_type) = canon;
-          r.assign ("cxx.host.cpu", string_type) = t.cpu;
-          r.assign ("cxx.host.vendor", string_type) = t.vendor;
-          r.assign ("cxx.host.system", string_type) = t.system;
-          r.assign ("cxx.host.version", string_type) = t.version;
+          r.assign ("cxx.target", string_type) = canon;
+          r.assign ("cxx.target.cpu", string_type) = t.cpu;
+          r.assign ("cxx.target.vendor", string_type) = t.vendor;
+          r.assign ("cxx.target.system", string_type) = t.system;
+          r.assign ("cxx.target.version", string_type) = t.version;
         }
         catch (const invalid_argument& e)
         {