From 8cf50bc1fdaea47832a2b7404b435bf942cefd5a Mon Sep 17 00:00:00 2001
From: Vadim Chugunov <vadimcn@gmail.com>
Date: Mon, 2 Nov 2015 11:42:20 -0800
Subject: [PATCH] Merged windows and unix `find_libdir()`

---
 src/librustc/metadata/filesearch.rs | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/librustc/metadata/filesearch.rs b/src/librustc/metadata/filesearch.rs
index 7ea4ef0d1c0..546c205f99c 100644
--- a/src/librustc/metadata/filesearch.rs
+++ b/src/librustc/metadata/filesearch.rs
@@ -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 {