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

Merged windows and unix `find_libdir()`

This commit is contained in:
Vadim Chugunov 2015-11-02 11:42:20 -08:00
parent 4e0c6db67f
commit 8cf50bc1fd
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/librustc/metadata/filesearch.rs
View File

@ -258,7 +258,6 @@ pub fn rust_path() -> Vec<PathBuf> {
}
// The name of the directory rustc expects libraries to be located.
#[cfg(unix)]
fn find_libdir(sysroot: &Path) -> String {
// FIXME: This is a quick hack to make the rustc binary able to locate
// Rust libraries in Linux environments where libraries might be installed
@ -292,11 +291,6 @@ fn find_libdir(sysroot: &Path) -> String {
}
}
#[cfg(windows)]
fn find_libdir(_sysroot: &Path) -> String {
"lib".to_string()
}
// The name of rustc's own place to organize libraries.
// Used to be "rustc", now the default is "rustlib"
pub fn rustlibdir() -> String {