1 files changed, 8 insertions, 25 deletions
diff --git a/libbutl/target-triplet.cxx b/libbutl/target-triplet.cxx
index 611b758..e28f119 100644
--- a/libbutl/target-triplet.cxx
+++ b/libbutl/target-triplet.cxx
@@ -1,33 +1,9 @@
 // file      : libbutl/target-triplet.cxx -*- C++ -*-
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef __cpp_modules_ts
-#include <libbutl/target-triplet.mxx>
-#endif
-
-// C includes.
-
-#ifndef __cpp_lib_modules_ts
-#include <string>
-#include <ostream>
+#include <libbutl/target-triplet.hxx>
 
 #include <stdexcept> // invalid_argument
-#endif
-
-// Other includes.
-
-#ifdef __cpp_modules_ts
-module butl.target_triplet;
-
-// Only imports additional to interface.
-#ifdef __clang__
-#ifdef __cpp_lib_modules_ts
-import std.core;
-import std.io;
-#endif
-#endif
-
-#endif
 
 using namespace std;
 
@@ -112,6 +88,13 @@ namespace butl
     if (system.front () == '-' || system.back () == '-')
       bad ("invalid os/kernel/abi");
 
+    // Canonicalize SYSTEM.
+    //
+    if (system == "linux")
+      system = "linux-gnu"; // Per config.sub.
+    else if (system == "windows-gnu" && vendor == "w64") // Clang's innovation.
+      system = "mingw32";
+
     // Extract VERSION for some recognized systems.
     //
     string::size_type v (0);