Revert "build: Build libraries in the bin directory on win32"

This reverts commit 23e0d16b5f.

src/comp/back/rpath.rs

@@ -191,6 +191,7 @@ fn minimize_rpaths(rpaths: [str]) -> [str] {
 #[cfg(target_os = "linux")]
 #[cfg(target_os = "macos")]
 #[cfg(target_os = "freebsd")]
+#[cfg(test)]
 mod test {
     #[test]
     fn test_rpaths_to_flags() {

src/comp/util/filesearch.rs

@@ -16,7 +16,6 @@ export pick_file;
 export search;
 export relative_target_lib_path;
 export get_cargo_root;
-export libdir;
 
 type pick<T> = block(path: fs::path) -> option::t<T>;
 
@@ -81,7 +80,7 @@ fn search<T: copy>(filesearch: filesearch, pick: pick<T>) -> option::t<T> {
 }
 
 fn relative_target_lib_path(target_triple: str) -> [fs::path] {
-    [libdir(), "rustc", target_triple, libdir()]
+    ["lib", "rustc", target_triple, "lib"]
 }
 
 fn make_target_lib_path(sysroot: fs::path,
@@ -122,16 +121,6 @@ fn get_cargo_root() -> result::t<fs::path, str> {
 
 fn get_cargo_lib_path() -> result::t<fs::path, str> {
     result::chain(get_cargo_root()) { |p|
-        result::ok(fs::connect(p, libdir()))
+        result::ok(fs::connect(p, "lib"))
     }
-}
-
-// The name of the directory rustc expects libraries to be located.
-// On Unix should be "lib", on windows "bin"
-fn libdir() -> str {
-   let libdir = #env("CFG_LIBDIR");
-   if str::is_empty(libdir) {
-      fail "rustc compiled without CFG_LIBDIR environment variable";
-   }
-   libdir
-}
+}

src/etc/snapshot.py

@@ -29,11 +29,11 @@ snapshot_files = {
               "lib/librustrt.dylib",
               "lib/librustllvm.dylib"],
     "winnt": ["bin/rustc.exe",
-              "bin/core-*.dll",
-              "bin/std-*.dll",
-              "bin/rustc-*.dll",
-              "bin/rustrt.dll",
-              "bin/rustllvm.dll"],
+              "lib/core-*.dll",
+              "lib/std-*.dll",
+              "lib/rustc-*.dll",
+              "lib/rustrt.dll",
+              "lib/rustllvm.dll"],
     "freebsd": ["bin/rustc",
                 "lib/libcore-*.so",
                 "lib/libstd-*.so",