| diff --git a/src/bootstrap/compile.rs b/src/bootstrap/compile.rs |
| index 576267e69..e108b2874 100644 |
| --- a/src/bootstrap/compile.rs |
| +++ b/src/bootstrap/compile.rs |
| @@ -799,6 +799,9 @@ pub fn build_codegen_backend(builder: &Builder<'_>, |
| if builder.config.llvm_use_libcxx { |
| cargo.env("LLVM_USE_LIBCXX", "1"); |
| } |
| + if builder.config.llvm_optimize && !builder.config.llvm_release_debuginfo { |
| + cargo.env("LLVM_NDEBUG", "1"); |
| + } |
| } |
| _ => panic!("unknown backend: {}", backend), |
| } |
| diff --git a/src/librustc_llvm/build.rs b/src/librustc_llvm/build.rs |
| index 21fa872c8..81680e613 100644 |
| --- a/src/librustc_llvm/build.rs |
| +++ b/src/librustc_llvm/build.rs |
| @@ -154,6 +154,10 @@ fn main() { |
| cfg.define("LLVM_RUSTLLVM", None); |
| } |
| |
| + if env::var_os("LLVM_NDEBUG").is_some() { |
| + cfg.define("NDEBUG", None); |
| + } |
| + |
| build_helper::rerun_if_changed_anything_in_dir(Path::new("../rustllvm")); |
| cfg.file("../rustllvm/PassWrapper.cpp") |
| .file("../rustllvm/RustWrapper.cpp") |
