Skip to content

Commit fc79bc9

Browse files
committed
Fix C++ standard library name for *-windows-gnullvm targets
1 parent b02f086 commit fc79bc9

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

src/bootstrap/src/core/build_steps/compile.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1417,12 +1417,14 @@ fn rustc_llvm_env(builder: &Builder<'_>, cargo: &mut Cargo, target: TargetSelect
14171417
&& !target.contains("apple")
14181418
&& !target.contains("solaris")
14191419
{
1420+
let libstdcxx_name =
1421+
if target.contains("windows-gnullvm") { "libc++.a" } else { "libstdc++.a" };
14201422
let file = compiler_file(
14211423
builder,
14221424
&builder.cxx(target).unwrap(),
14231425
target,
14241426
CLang::Cxx,
1425-
"libstdc++.a",
1427+
libstdcxx_name,
14261428
);
14271429
cargo.env("LLVM_STATIC_STDCPP", file);
14281430
}

0 commit comments

Comments
 (0)