Skip to content

Commit 2cc93b8

Browse files
authored
Rollup merge of rust-lang#149590 - petrochenkov:norlld, r=mati865
linker: Remove special case for `rust-lld` in `detect_self_contained_mingw` `rust-lld` is supposed to live inside sysroot, so it doesn't change the behavior of the function, only removes a potential micro-optimization. rust-lang#149178 (comment) r? `@mati865`
2 parents a2aa4f0 + 388c42e commit 2cc93b8

File tree

1 file changed

+0
-4
lines changed
  • compiler/rustc_codegen_ssa/src/back

1 file changed

+0
-4
lines changed

compiler/rustc_codegen_ssa/src/back/link.rs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1763,10 +1763,6 @@ fn link_output_kind(sess: &Session, crate_type: CrateType) -> LinkOutputKind {
17631763

17641764
// Returns true if linker is located within sysroot
17651765
fn detect_self_contained_mingw(sess: &Session, linker: &Path) -> bool {
1766-
// Assume `-C linker=rust-lld` as self-contained mode
1767-
if linker == Path::new("rust-lld") {
1768-
return true;
1769-
}
17701766
let linker_with_extension = if cfg!(windows) && linker.extension().is_none() {
17711767
linker.with_extension("exe")
17721768
} else {

0 commit comments

Comments
 (0)