mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rollup merge of #81594 - bjorn3:avoid_building_llvm_for_dwp, r=sanxiyn

Browse Source 
Avoid building LLVM just for llvm-dwp

When the LLVM backend is disabled, the llvm-project submodule is not checked out by default. This breaks the bootstrap test for cg_clif. As cg_clif doesn't support split debuginfo anyway llvm-dwp is not necessary. Other backends would likely not want to build LLVM just for llvm-dwp either.

Fixes https://github.com/bjorn3/rustc_codegen_cranelift/issues/1119
This commit is contained in:
Jonas Schievink 2021-02-01 14:29:44 +01:00 committed by GitHub
commit 52907cc237
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/bootstrap/compile.rs
View File

@ -1050,8 +1050,10 @@ impl Step for Assemble {
builder.copy(&lld_install.join("bin").join(&src_exe), &libdir_bin.join(&dst_exe)); builder.copy(&lld_install.join("bin").join(&src_exe), &libdir_bin.join(&dst_exe));
} }
// Similarly, copy `llvm-dwp` into libdir for Split DWARF. // Similarly, copy `llvm-dwp` into libdir for Split DWARF. Only copy it when the LLVM
{ // backend is used to avoid unnecessarily building LLVM and because LLVM is not checked
// out by default when the LLVM backend is not enabled.
if builder.config.rust_codegen_backends.contains(&INTERNER.intern_str("llvm")) {
let src_exe = exe("llvm-dwp", target_compiler.host); let src_exe = exe("llvm-dwp", target_compiler.host);
let dst_exe = exe("rust-llvm-dwp", target_compiler.host); let dst_exe = exe("rust-llvm-dwp", target_compiler.host);
let llvm_config_bin = builder.ensure(native::Llvm { target: target_compiler.host }); let llvm_config_bin = builder.ensure(native::Llvm { target: target_compiler.host });