Unrolled build for rust-lang#138137

Rollup merge of rust-lang#138137 - ZequanWu:fix-triple, r=cuviper setTargetTriple now accepts Triple rather than string llvm/llvm-project#129868 updated `setTargetTriple`
rust-lang-ci · Mar 8, 2025 · 558ab23 · 558ab23
2 parents f5a1ef7 + 8814679
commit 558ab23
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp b/compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp
@@ -152,8 +152,12 @@ extern "C" LLVMContextRef LLVMRustContextCreate(bool shouldDiscardNames) {
 }
 
 extern "C" void LLVMRustSetNormalizedTarget(LLVMModuleRef M,
-                                            const char *Triple) {
-  unwrap(M)->setTargetTriple(Triple::normalize(Triple));
+                                            const char *Target) {
+#if LLVM_VERSION_GE(21, 0)
+  unwrap(M)->setTargetTriple(Triple(Triple::normalize(Target)));
+#else
+  unwrap(M)->setTargetTriple(Triple::normalize(Target));
+#endif
 }
 
 extern "C" void LLVMRustPrintPassTimings(RustStringRef OutBuf) {