[llvm] [orc-rt] Implement Windows target triple detection (PR #224514)

[Lang Hames via llvm-commits]

================
@@ -46,13 +46,26 @@ TEST(TargetTripleTest, ArchMatchesCompileTarget) {
 
 TEST(TargetTripleTest, OSMatchesCompileTarget) {
   auto Triple = sys::detectTargetTriple();
+<<<<<<< HEAD
 #if defined(__APPLE__)
   EXPECT_NE(Triple.find("-apple-"), std::string::npos);
 #elif defined(__linux__)
   EXPECT_NE(Triple.find("-linux-"), std::string::npos);
 #endif
 }
+#endif
+=======
+
+#if defined(__APPLE__)
+    EXPECT_NE(Triple.find("-apple-"), std::string::npos);
+#elif defined(__linux__)
+      EXPECT_NE(Triple.find("-linux-"), std::string::npos);
+#elif defined(_WIN32)
+      EXPECT_NE(Triple.find("-windows-"), std::string::npos);
+#endif
+}
 
+>>>>>>> 4504f54e6dad ([orc-rt] Implement Windows target triple detection)
----------------
lhames wrote:

Merge conflict unresolved.

https://github.com/llvm/llvm-project/pull/224514