From beb827d154cdc96dfe3042034bb301f6134f4259 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Mon, 24 Aug 2020 11:37:22 +0200 Subject: Add target_triplet::representation() in addition to string() Also stop stripping `none-` prefix from the system component. --- libbutl/target-triplet.cxx | 29 ++++++++++++++++++++++++----- 1 file changed, 24 insertions(+), 5 deletions(-) (limited to 'libbutl/target-triplet.cxx') diff --git a/libbutl/target-triplet.cxx b/libbutl/target-triplet.cxx index c2535b1..f59875f 100644 --- a/libbutl/target-triplet.cxx +++ b/libbutl/target-triplet.cxx @@ -71,11 +71,6 @@ namespace butl if (l != p) bad ("too many components"); - - // Handle the none-* case here. - // - if (s.compare (l + 1, 5, "none-") == 0) - l += 5; } else { @@ -170,4 +165,28 @@ namespace butl return r; } + + std::string target_triplet:: + representation () const + { + std::string r (cpu); + + { + if (!r.empty ()) r += '-'; + r += vendor.empty () ? "unknown" : vendor.c_str (); + } + + if (!system.empty ()) + { + if (!r.empty ()) r += '-'; + r += system; + } + + if (!version.empty ()) + { + r += version; + } + + return r; + } } -- cgit v1.1