OpenE2K
/
rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix MinGW detection for Cygwin

This commit is contained in:
Mateusz Mikuła 2020-02-21 15:35:31 +01:00
parent 0176a9eef8
commit b3b252b401
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/librustc_codegen_ssa/back/link.rs
View File

@ -1008,14 +1008,13 @@ fn get_crt_libs_path(sess: &Session) -> Option<PathBuf> {
path.pop();
path.pop();
// Based on Clang MinGW driver
let probe_path = path.join(&mingw_dir).join("lib");
if probe_path.exists() {
return Some(probe_path);
};
let probe_path = path.join(&mingw_dir).join("sys-root/mingw/lib");
if probe_path.exists() {
return Some(probe_path);
};
let probe_paths = vec!["lib", "sys-root/mingw/lib"];
for probe_path in probe_paths {
let probe_path = path.join(&mingw_dir).join(&probe_path);
if probe_path.join("crt2.o").exists() {
return Some(probe_path);
};
}
};
};
None