about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMara Bos <m-ou.se@m-ou.se>2021-01-14 18:00:25 +0000
committerGitHub <noreply@github.com>2021-01-14 18:00:25 +0000
commitce3bc76a8662727c70e4894d8e49c4689505d7bc (patch)
tree249a90c7fd6edb36f83c837d1d5559d100c0660b
parentd5e55cee994688d51f6c7880dc0bf6ded9492745 (diff)
parent64c1b0d614949f405d8b4498a3b2ea59d9ec230e (diff)
downloadrust-ce3bc76a8662727c70e4894d8e49c4689505d7bc.tar.gz
rust-ce3bc76a8662727c70e4894d8e49c4689505d7bc.zip
Rollup merge of #80981 - bjorn3:bjorn3-patch-1, r=jonas-schievink
Fix -Cpasses=list and llvm version print with -vV

cc https://github.com/rust-lang/rust/pull/77975#issuecomment-759362933
-rw-r--r--compiler/rustc_driver/src/lib.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler/rustc_driver/src/lib.rs b/compiler/rustc_driver/src/lib.rs
index 509f81e1653..f8ceb94916e 100644
--- a/compiler/rustc_driver/src/lib.rs
+++ b/compiler/rustc_driver/src/lib.rs
@@ -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();
         }
     }
@@ -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;