From c90a04701602353f410aad7073abffe758a01586 Mon Sep 17 00:00:00 2001 From: Brian Anderson Date: Tue, 22 May 2012 15:28:01 -0700 Subject: [PATCH] rustc: Don't fall back to static libraries when shared isn't found Nothing on Earth depends on this functionality and it is probably unexpected --- src/rustc/metadata/loader.rs | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/rustc/metadata/loader.rs b/src/rustc/metadata/loader.rs index 8d0294efcc8b..b12d3e5b69be 100644 --- a/src/rustc/metadata/loader.rs +++ b/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) ->