From 4796871fb7ce4ffbefc2ea5cb138cd4741e09216 Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Sun, 13 May 2018 07:45:16 -0700 Subject: Revert "musl: don't use the included startfiles with -crt-static" This reverts commit a5a875d17b34b61326d803eb2edea526d3bd6914. --- src/librustc_codegen_llvm/back/link.rs | 16 ---------------- 1 file changed, 16 deletions(-) (limited to 'src/librustc_codegen_llvm/back') diff --git a/src/librustc_codegen_llvm/back/link.rs b/src/librustc_codegen_llvm/back/link.rs index 4e9910e58f3..735c4d2f76f 100644 --- a/src/librustc_codegen_llvm/back/link.rs +++ b/src/librustc_codegen_llvm/back/link.rs @@ -625,11 +625,6 @@ fn link_natively(sess: &Session, if let Some(args) = sess.target.target.options.pre_link_args.get(&flavor) { cmd.args(args); } - if let Some(args) = sess.target.target.options.pre_link_args_crt.get(&flavor) { - if sess.crt_static() { - cmd.args(args); - } - } if let Some(ref args) = sess.opts.debugging_opts.pre_link_args { cmd.args(args); } @@ -644,12 +639,6 @@ fn link_natively(sess: &Session, cmd.arg(root.join(obj)); } - if crate_type == config::CrateTypeExecutable && sess.crt_static() { - for obj in &sess.target.target.options.pre_link_objects_exe_crt { - cmd.arg(root.join(obj)); - } - } - if sess.target.target.options.is_like_emscripten { cmd.arg("-s"); cmd.arg(if sess.panic_strategy() == PanicStrategy::Abort { @@ -671,11 +660,6 @@ fn link_natively(sess: &Session, for obj in &sess.target.target.options.post_link_objects { cmd.arg(root.join(obj)); } - if sess.crt_static() { - for obj in &sess.target.target.options.post_link_objects_crt { - cmd.arg(root.join(obj)); - } - } if let Some(args) = sess.target.target.options.post_link_args.get(&flavor) { cmd.args(args); } -- cgit 1.4.1-3-g733a5