Skip to content

Commit 3a37aa5

Browse files
Rollup merge of #156985 - mati865:additional-llvm-dll-windows-only, r=jieyouxu
Limit the additional DLL to Windows #156229 didn't limit the additional DLL copy to Windows as it was supposed to.
2 parents 0846622 + 12b3dd8 commit 3a37aa5

1 file changed

Lines changed: 4 additions & 2 deletions

File tree

  • src/bootstrap/src/core/build_steps

src/bootstrap/src/core/build_steps/dist.rs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2591,8 +2591,10 @@ pub fn maybe_install_llvm_runtime(builder: &Builder<'_>, target: TargetSelection
25912591
// To workaround lack of rpath on Windows, we bundle another copy of
25922592
// the LLVM DLL to make rust-lld and llvm-tools work when `sysroot/bin`
25932593
// is missing from PATH, i.e. when they not launched by rustc.
2594-
let dst_libdir = sysroot.join("lib/rustlib").join(target).join("bin");
2595-
maybe_install_llvm(builder, target, &dst_libdir, false);
2594+
if target.triple.contains("windows") {
2595+
let dst_libdir = sysroot.join("lib/rustlib").join(target).join("bin");
2596+
maybe_install_llvm(builder, target, &dst_libdir, false);
2597+
}
25962598
}
25972599
}
25982600

0 commit comments

Comments
 (0)