user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Auto merge of #26044 - nagisa:canonicalize-metadata-loader, r=alexcrichton

Browse source 
This might fail when --extern library is a symlink to an invalid location. Instead just pretend it
doesn’t exist at all.

Fixes #26006
This commit is contained in:
bors 2015-06-08 17:44:30 +00:00
commit 4e14ef0516
4 changed files with 49 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/librustc/metadata/loader.rs
View file

@ -429,13 +429,14 @@ impl<'a> Context<'a> {
let slot = candidates.entry(hash_str)
.or_insert_with(|| (HashMap::new(), HashMap::new()));
let (ref mut rlibs, ref mut dylibs) = *slot;
if rlib {
rlibs.insert(fs::canonicalize(path).unwrap(), kind);
} else {
dylibs.insert(fs::canonicalize(path).unwrap(), kind);
}
FileMatches
fs::canonicalize(path).map(|p| {
if rlib {
rlibs.insert(p, kind);
} else {
dylibs.insert(p, kind);
}
FileMatches
}).unwrap_or(FileDoesntMatch)
});
self.rejected_via_kind.extend(staticlibs.into_iter());