Skip to content

Commit 75a7aa7

Browse files
committed
---
yaml --- r: 15959 b: refs/heads/try c: c90a047 h: refs/heads/master i: 15957: 2683eba 15955: 69f8929 15951: 2b71a25 v: v3
1 parent 4b7ab9b commit 75a7aa7

File tree

2 files changed

+3
-8
lines changed

2 files changed

+3
-8
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
refs/heads/master: 61b1875c16de39c166b0f4d54bba19f9c6777d1a
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
5-
refs/heads/try: 5b4ab9301742b210bc519ddf9a29cdb18f412e0d
5+
refs/heads/try: c90a04701602353f410aad7073abffe758a01586
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

branches/try/src/rustc/metadata/loader.rs

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,8 @@ fn find_library_crate(sess: session::session, span: span,
4040
let metas = metas;
4141

4242
let nn = default_native_lib_naming(sess, sess.opts.static);
43-
let x =
44-
find_library_crate_aux(sess, span, nn,
45-
metas, hash, sess.filesearch);
46-
if x != none || sess.opts.static { ret x; }
47-
let nn2 = default_native_lib_naming(sess, true);
48-
ret find_library_crate_aux(sess, span, nn2, metas, hash,
49-
sess.filesearch);
43+
find_library_crate_aux(sess, span, nn,
44+
metas, hash, sess.filesearch)
5045
}
5146

5247
fn default_native_lib_naming(sess: session::session, static: bool) ->

0 commit comments

Comments
 (0)