rust-lang · bors · Jul 23, 2020 · Jul 22, 2020 · Jul 22, 2020 · Jul 22, 2020
diff --git a/src/librustc_ast/build.rs b/src/librustc_ast/build.rs
diff --git a/src/librustc_attr/build.rs b/src/librustc_attr/build.rs
diff --git a/src/librustc_codegen_llvm/build.rs b/src/librustc_codegen_llvm/build.rs
diff --git a/src/librustc_codegen_ssa/build.rs b/src/librustc_codegen_ssa/build.rs
diff --git a/src/librustc_driver/build.rs b/src/librustc_driver/build.rs
diff --git a/src/librustc_incremental/build.rs b/src/librustc_incremental/build.rs
diff --git a/src/librustc_interface/build.rs b/src/librustc_interface/build.rs
diff --git a/src/librustc_llvm/build.rs b/src/librustc_llvm/build.rs
@@ -163,7 +163,7 @@ fn main() {
         cfg.define(&flag, None);
     }
 
-    println!("cargo:rerun-if-changed-env=LLVM_RUSTLLVM");
+    println!("cargo:rerun-if-env-changed=LLVM_RUSTLLVM");
     if env::var_os("LLVM_RUSTLLVM").is_some() {
         cfg.define("LLVM_RUSTLLVM", None);
     }

diff --git a/src/librustc_metadata/build.rs b/src/librustc_metadata/build.rs
diff --git a/src/librustc_middle/build.rs b/src/librustc_middle/build.rs
diff --git a/src/librustc_session/session.rs b/src/librustc_session/session.rs
@@ -548,7 +548,7 @@ impl Session {
         self.opts.debugging_opts.asm_comments
     }
     pub fn verify_llvm_ir(&self) -> bool {
-        self.opts.debugging_opts.verify_llvm_ir || cfg!(always_verify_llvm_ir)
+        self.opts.debugging_opts.verify_llvm_ir || option_env!("RUSTC_VERIFY_LLVM_IR").is_some()
     }
     pub fn borrowck_stats(&self) -> bool {
         self.opts.debugging_opts.borrowck_stats

diff --git a/src/librustc_target/build.rs b/src/librustc_target/build.rs