Mirrors/rust
1
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2026-05-29 20:46:07 +03:00
Code Issues Packages Projects Releases Wiki Activity

Rollup merge of #156985 - mati865:additional-llvm-dll-windows-only, r=jieyouxu

Browse Source 
Limit the additional DLL to Windows

rust-lang/rust#156229 didn't limit the additional DLL copy to Windows as it was supposed to.
This commit is contained in:
Guillaume Gomez
2026-05-27 20:45:14 +02:00
committed by GitHub
parent 0846622465 12b3dd8a35
commit 3a37aa5765
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/bootstrap/src/core/build_steps/dist.rs
+4 -2
View File
@@ -2591,8 +2591,10 @@ pub fn maybe_install_llvm_runtime(builder: &Builder<'_>, target: TargetSelection
// To workaround lack of rpath on Windows, we bundle another copy of
// the LLVM DLL to make rust-lld and llvm-tools work when `sysroot/bin`
// is missing from PATH, i.e. when they not launched by rustc.
let dst_libdir = sysroot.join("lib/rustlib").join(target).join("bin");
maybe_install_llvm(builder, target, &dst_libdir, false);
if target.triple.contains("windows") {
let dst_libdir = sysroot.join("lib/rustlib").join(target).join("bin");
maybe_install_llvm(builder, target, &dst_libdir, false);
}
}
}