Skip to content

Commit 0124341

Browse files
committed
Only consider stem when extension is exe.
This commit modifies linker flavor inference to only remove the extension to the linker when performing inference if that extension is a 'exe'.
1 parent 147e60c commit 0124341

File tree

1 file changed

+5
-1
lines changed
  • src/librustc_codegen_ssa/back

1 file changed

+5
-1
lines changed

src/librustc_codegen_ssa/back/link.rs

+5-1
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,11 @@ pub fn linker_and_flavor(sess: &Session) -> (PathBuf, LinkerFlavor) {
161161
LinkerFlavor::Lld(_) => "lld",
162162
}), flavor)),
163163
(Some(linker), None) => {
164-
let stem = linker.file_stem().and_then(|stem| stem.to_str()).unwrap_or_else(|| {
164+
let stem = if linker.extension().and_then(|ext| ext.to_str()) == Some("exe") {
165+
linker.file_stem().and_then(|stem| stem.to_str())
166+
} else {
167+
linker.to_str()
168+
}.unwrap_or_else(|| {
165169
sess.fatal("couldn't extract file stem from specified linker");
166170
}).to_owned();
167171

0 commit comments

Comments
 (0)