diff options
| author | bors <bors@rust-lang.org> | 2018-11-11 22:38:54 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-11-11 22:38:54 +0000 |
| commit | 775eab58835f9bc0f1f01ccbb79725dce0c73b51 (patch) | |
| tree | cdedaeb84917423b570a30903ef25ae8dcd80ab1 /src/librustc_codegen_llvm/back | |
| parent | ca79ecd6940e30d4b2466bf378632efcdf5745c7 (diff) | |
| parent | 3cc8b17451aac4a144baa48bb48f4187a5529769 (diff) | |
| download | rust-775eab58835f9bc0f1f01ccbb79725dce0c73b51.tar.gz rust-775eab58835f9bc0f1f01ccbb79725dce0c73b51.zip | |
Auto merge of #55698 - nikic:remove-llvm-4-support, r=alexcrichton
Remove support for building against LLVM 4 With emscripten removed in #55626, we no longer need to support building against LLVM 4.
Diffstat (limited to 'src/librustc_codegen_llvm/back')
| -rw-r--r-- | src/librustc_codegen_llvm/back/lto.rs | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/librustc_codegen_llvm/back/lto.rs b/src/librustc_codegen_llvm/back/lto.rs index 76faffa2521..60b06c579cb 100644 --- a/src/librustc_codegen_llvm/back/lto.rs +++ b/src/librustc_codegen_llvm/back/lto.rs @@ -595,9 +595,7 @@ fn run_pass_manager(cgcx: &CodegenContext, }; with_llvm_pmb(llmod, config, opt_level, false, &mut |b| { if thin { - if !llvm::LLVMRustPassManagerBuilderPopulateThinLTOPassManager(b, pm) { - panic!("this version of LLVM does not support ThinLTO"); - } + llvm::LLVMRustPassManagerBuilderPopulateThinLTOPassManager(b, pm); } else { llvm::LLVMPassManagerBuilderPopulateLTOPassManager(b, pm, /* Internalize = */ False, |