Skip to content

Commit

Permalink
Rollup merge of rust-lang#80981 - bjorn3:bjorn3-patch-1, r=jonas-schi…
Browse files Browse the repository at this point in the history
…evink

Fix -Cpasses=list and llvm version print with -vV

cc rust-lang#77975 (comment)
  • Loading branch information
JohnTitor authored Jan 14, 2021
2 parents 75c6f6f + 64c1b0d commit 70f5725
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions compiler/rustc_driver/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -798,7 +798,7 @@ pub fn version(binary: &str, matches: &getopts::Matches) {
println!("commit-date: {}", unw(util::commit_date_str()));
println!("host: {}", config::host_triple());
println!("release: {}", unw(util::release_str()));
if cfg!(llvm) {
if cfg!(feature = "llvm") {
get_builtin_codegen_backend("llvm")().print_version();
}
}
Expand Down Expand Up @@ -1087,7 +1087,7 @@ pub fn handle_options(args: &[String]) -> Option<getopts::Matches> {
}

if cg_flags.iter().any(|x| *x == "passes=list") {
if cfg!(llvm) {
if cfg!(feature = "llvm") {
get_builtin_codegen_backend("llvm")().print_passes();
}
return None;
Expand Down

0 comments on commit 70f5725

Please sign in to comment.