From 04a02ffb94314a842a87142042175822d60e58b4 Mon Sep 17 00:00:00 2001 From: Luqman Aden Date: Tue, 11 Nov 2014 20:23:32 -0500 Subject: [PATCH] librustc: Respect no-compiler-rt target option for static libs as well. --- src/librustc/back/link.rs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/librustc/back/link.rs b/src/librustc/back/link.rs index 3f76a575a1e3..e72c6fcd4df1 100644 --- a/src/librustc/back/link.rs +++ b/src/librustc/back/link.rs @@ -728,7 +728,9 @@ fn link_staticlib(sess: &Session, obj_filename: &Path, out_filename: &Path) { if sess.target.target.options.morestack { ab.add_native_library("morestack").unwrap(); } - ab.add_native_library("compiler-rt").unwrap(); + if !sess.target.target.options.no_compiler_rt { + ab.add_native_library("compiler-rt").unwrap(); + } let crates = sess.cstore.get_used_crates(cstore::RequireStatic); let mut all_native_libs = vec![];