Fix incorrect NDEBUG handling in LLVM bindings

We currently compile our LLVM bindings using `-DNDEBUG` if
debuginfo for LLVM is disabled. However, `NDEBUG` doesn't have
any relation to debuginfo, it controls whether assertions are
enabled.

Split the LLVM_NDEBUG environment variable into two, so that
assertions and debuginfo are controlled independently.

Author: nikic

compiler/rustc_llvm/build.rs

@@ -197,8 +197,11 @@ fn main() {
         cfg.define("LLVM_RUSTLLVM", None);
     }
 
-    if tracked_env_var_os("LLVM_NDEBUG").is_some() {
+    if tracked_env_var_os("LLVM_ASSERTIONS").is_none() {
         cfg.define("NDEBUG", None);
+    }
+
+    if tracked_env_var_os("LLVM_NO_DEBUGINFO").is_some() {
         cfg.debug(false);
     }
 

src/bootstrap/src/core/build_steps/compile.rs

@@ -1213,8 +1213,11 @@ fn rustc_llvm_env(builder: &Builder<'_>, cargo: &mut Cargo, target: TargetSelect
     if builder.config.llvm_use_libcxx {
         cargo.env("LLVM_USE_LIBCXX", "1");
     }
+    if builder.config.llvm_assertions {
+        cargo.env("LLVM_ASSERTIONS", "1");
+    }
     if builder.config.llvm_optimize && !builder.config.llvm_release_debuginfo {
-        cargo.env("LLVM_NDEBUG", "1");
+        cargo.env("LLVM_NO_DEBUGINFO", "1");
     }
 }