about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMateusz Mikuła <oss@mateuszmikula.dev>2025-05-06 18:29:31 +0200
committerMateusz Mikuła <oss@mateuszmikula.dev>2025-05-31 15:58:43 +0200
commit7eea11b27c602deed37d94c87c21f4b14f858170 (patch)
tree74850a26c4269f7d425f5817ca66b1b1318e2836
parent98961cd3da999cda30a1ab6c751bc9cf0a6cb6b3 (diff)
downloadrust-7eea11b27c602deed37d94c87c21f4b14f858170.tar.gz
rust-7eea11b27c602deed37d94c87c21f4b14f858170.zip
Fix C++ standard library name for *-windows-gnullvm targets
-rw-r--r--src/bootstrap/src/core/build_steps/compile.rs4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/bootstrap/src/core/build_steps/compile.rs b/src/bootstrap/src/core/build_steps/compile.rs
index 38c1c852210..8668550bddf 100644
--- a/src/bootstrap/src/core/build_steps/compile.rs
+++ b/src/bootstrap/src/core/build_steps/compile.rs
@@ -1417,12 +1417,14 @@ fn rustc_llvm_env(builder: &Builder<'_>, cargo: &mut Cargo, target: TargetSelect
         && !target.contains("apple")
         && !target.contains("solaris")
     {
+        let libstdcxx_name =
+            if target.contains("windows-gnullvm") { "libc++.a" } else { "libstdc++.a" };
         let file = compiler_file(
             builder,
             &builder.cxx(target).unwrap(),
             target,
             CLang::Cxx,
-            "libstdc++.a",
+            libstdcxx_name,
         );
         cargo.env("LLVM_STATIC_STDCPP", file);
     }