commit 3fa8cc38777362f30ec560f6164239923403ea3e
author Mazdak Farrokhzad <twingoow@gmail.com> Tue Jan 21 19:42:23 2020 +0100
committer GitHub <noreply@github.com> Tue Jan 21 19:42:23 2020 +0100
tree b954a6263279c4e04d444988e033b1b8c54797d0
parent dabd81666a0c8c7cedf3300d42dd31291989876a
parent 766f6c5d0ad5c71f42ab3a305572bf1e7b5edafa

Rollup merge of #68328 - jethrogb:jb/target-llvm-args, r=alexcrichton

Actually pass target LLVM args to LLVM

Missed in #68059

r? @alexcrichton

src/librustc_codegen_llvm/llvm_util.rs

diff --git a/src/librustc_codegen_llvm/llvm_util.rs b/src/librustc_codegen_llvm/llvm_util.rs
index 52613fe..4823fe1 100644
--- a/src/librustc_codegen_llvm/llvm_util.rs
+++ b/src/librustc_codegen_llvm/llvm_util.rs
@@ -58,9 +58,10 @@
 
     let cg_opts = sess.opts.cg.llvm_args.iter();
     let tg_opts = sess.target.target.options.llvm_args.iter();
+    let sess_args = cg_opts.chain(tg_opts);
 
     let user_specified_args: FxHashSet<_> =
-        cg_opts.chain(tg_opts).map(|s| llvm_arg_to_arg_name(s)).filter(|s| s.len() > 0).collect();
+        sess_args.clone().map(|s| llvm_arg_to_arg_name(s)).filter(|s| s.len() > 0).collect();
 
     {
         // This adds the given argument to LLVM. Unless `force` is true
@@ -107,7 +108,7 @@
         // during inlining. Unfortunately these may block other optimizations.
         add("-preserve-alignment-assumptions-during-inlining=false", false);
 
-        for arg in &sess.opts.cg.llvm_args {
+        for arg in sess_args {
             add(&(*arg), true);
         }
     }