Skip to content

Commit 8cf50bc

Browse files
committed
Merged windows and unix find_libdir()
1 parent 4e0c6db commit 8cf50bc

File tree

1 file changed

+0
-6
lines changed

1 file changed

+0
-6
lines changed

src/librustc/metadata/filesearch.rs

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,6 @@ pub fn rust_path() -> Vec<PathBuf> {
258258
}
259259

260260
// The name of the directory rustc expects libraries to be located.
261-
#[cfg(unix)]
262261
fn find_libdir(sysroot: &Path) -> String {
263262
// FIXME: This is a quick hack to make the rustc binary able to locate
264263
// Rust libraries in Linux environments where libraries might be installed
@@ -292,11 +291,6 @@ fn find_libdir(sysroot: &Path) -> String {
292291
}
293292
}
294293

295-
#[cfg(windows)]
296-
fn find_libdir(_sysroot: &Path) -> String {
297-
"lib".to_string()
298-
}
299-
300294
// The name of rustc's own place to organize libraries.
301295
// Used to be "rustc", now the default is "rustlib"
302296
pub fn rustlibdir() -> String {

0 commit comments

Comments
 (0)