---

yaml
---
r: 105184
b: refs/heads/snap-stage3
c: f772e31
h: refs/heads/master
v: v3

Author: brson

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 62f1d68439dcfd509eaca29887afa97f22938373
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 6f9b30c6c11b05fdb299bcab97b5002a813c0bac
+refs/heads/snap-stage3: f772e31d6484f090b9bc50f8e14f426c9c6dfaff
 refs/heads/try: db814977d07bd798feb24f6b74c00800ef458a13
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/librustc/metadata/filesearch.rs

@@ -235,8 +235,14 @@ pub fn rust_path() -> Vec<Path> {
 
 // The name of the directory rustc expects libraries to be located.
 // On Unix should be "lib", on windows "bin"
+#[cfg(unix)]
 pub fn libdir() -> ~str {
-    (env!("CFG_LIBDIR_RELATIVE")).to_owned()
+    ~"lib"
+}
+
+#[cfg(windows)]
+pub fn libdir() -> ~str {
+    ~"bin"
 }
 
 // The name of rustc's own place to organize libraries.