mathieu/granite-rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Only consider stem when extension is exe.

Browse source 
This commit modifies linker flavor inference to only remove the extension
to the linker when performing inference if that extension is a 'exe'.
This commit is contained in:
David Wood 2018-11-29 20:40:43 +01:00
parent 147e60c5f8
commit 0124341935
No known key found for this signature in database
GPG key ID: 01760B4F9F53F154
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/librustc_codegen_ssa/back/link.rs
View file

@ -161,7 +161,11 @@ pub fn linker_and_flavor(sess: &Session) -> (PathBuf, LinkerFlavor) {
LinkerFlavor::Lld(_) => "lld",
}), flavor)),
(Some(linker), None) => {
let stem = linker.file_stem().and_then(|stem| stem.to_str()).unwrap_or_else(|| {
let stem = if linker.extension().and_then(|ext| ext.to_str()) == Some("exe") {
linker.file_stem().and_then(|stem| stem.to_str())
} else {
linker.to_str()
}.unwrap_or_else(|| {
sess.fatal("couldn't extract file stem from specified linker");
}).to_owned();