aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2020-08-24 11:51:20 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2020-08-24 11:51:20 +0200
commit3bfd12396f6ad66d2864e9fb5ba8be2e531a4e63 (patch)
tree6dfe3184fd070530f3c708633e591bdffeea0371
parentb86c1d8d2e0be140f6854d869e07139ff3c4221c (diff)
Use representation when passing target_triplet as hint
-rw-r--r--libbuild2/bin/init.cxx2
-rw-r--r--libbuild2/cc/guess.cxx2
-rw-r--r--libbuild2/cc/init.cxx2
-rw-r--r--libbuild2/functions-target-triplet.cxx1
4 files changed, 4 insertions, 3 deletions
diff --git a/libbuild2/bin/init.cxx b/libbuild2/bin/init.cxx
index 0d2d9b5..2f1e6db 100644
--- a/libbuild2/bin/init.cxx
+++ b/libbuild2/bin/init.cxx
@@ -329,7 +329,7 @@ namespace build2
l5 ([&]{trace << "canonical target: '" << t.string () << "'; "
<< "class: " << t.class_;});
- assert (!hint || s == t.string ());
+ assert (!hint || s == t.representation ());
// Also enter as bin.target.{cpu,vendor,system,version,class}
// for convenience of access.
diff --git a/libbuild2/cc/guess.cxx b/libbuild2/cc/guess.cxx
index 8fe4769..c0d04ef 100644
--- a/libbuild2/cc/guess.cxx
+++ b/libbuild2/cc/guess.cxx
@@ -2372,7 +2372,7 @@ namespace build2
tt.vendor = "microsoft";
tt.system = "win32-msvc";
tt.version = msvc_runtime_version (msvc_compiler_version (mi.msvc_ver));
- t = tt.string ();
+ t = tt.representation ();
// Add the MSVC information to the signature and checksum.
//
diff --git a/libbuild2/cc/init.cxx b/libbuild2/cc/init.cxx
index 6791190..bb50d07 100644
--- a/libbuild2/cc/init.cxx
+++ b/libbuild2/cc/init.cxx
@@ -304,7 +304,7 @@ namespace build2
// Note that all these variables have already been registered.
//
h.assign ("config.bin.target") =
- cast<target_triplet> (rs["cc.target"]).string ();
+ cast<target_triplet> (rs["cc.target"]).representation ();
if (auto l = extra.hints["config.bin.pattern"])
h.assign ("config.bin.pattern") = cast<string> (l);
diff --git a/libbuild2/functions-target-triplet.cxx b/libbuild2/functions-target-triplet.cxx
index f1b9f6b..ff9a15d 100644
--- a/libbuild2/functions-target-triplet.cxx
+++ b/libbuild2/functions-target-triplet.cxx
@@ -14,6 +14,7 @@ namespace build2
function_family f (m, "target_triplet");
f["string"] = [](target_triplet t) {return t.string ();};
+ f["representation"] = [](target_triplet t) {return t.representation ();};
// Target triplet-specific overloads from builtins.
//