---

yaml
---
r: 12953
b: refs/heads/master
c: c90a047
h: refs/heads/master
i:
  12951: 9d2f966
v: v3

Author: brson

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 5b4ab9301742b210bc519ddf9a29cdb18f412e0d
+refs/heads/master: c90a04701602353f410aad7073abffe758a01586
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
 refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf

trunk/src/rustc/metadata/loader.rs

@@ -40,13 +40,8 @@ fn find_library_crate(sess: session::session, span: span,
     let metas = metas;
 
     let nn = default_native_lib_naming(sess, sess.opts.static);
-    let x =
-        find_library_crate_aux(sess, span, nn,
-                               metas, hash, sess.filesearch);
-    if x != none || sess.opts.static { ret x; }
-    let nn2 = default_native_lib_naming(sess, true);
-    ret find_library_crate_aux(sess, span, nn2, metas, hash,
-                               sess.filesearch);
+    find_library_crate_aux(sess, span, nn,
+                           metas, hash, sess.filesearch)
 }
 
 fn default_native_lib_naming(sess: session::session, static: bool) ->