Restore explicit disabling of zstd when not wanted.

khuey · khuey · commit 15d02df6ea91 · 2024-08-04T12:16:12.000-07:00
diff --git a/src/bootstrap/src/core/build_steps/llvm.rs b/src/bootstrap/src/core/build_steps/llvm.rs
@@ -825,6 +825,8 @@ fn configure_llvm(builder: &Builder<'_>, target: TargetSelection, cfg: &mut cmak
     if builder.config.llvm_libzstd(target) {
         cfg.define("LLVM_ENABLE_ZSTD", "FORCE_ON");
         cfg.define("LLVM_USE_STATIC_ZSTD", "TRUE");
+    } else {
+        cfg.define("LLVM_ENABLE_ZSTD", "OFF");
     }
 
     if let Some(ref linker) = builder.config.llvm_use_linker {

Original file line number	Diff line number	Diff line change
`@@ -825,6 +825,8 @@ fn configure_llvm(builder: &Builder<'_>, target: TargetSelection, cfg: &mut cmak`
`825`	`825`	`if builder.config.llvm_libzstd(target) {`
`826`	`826`	`cfg.define("LLVM_ENABLE_ZSTD", "FORCE_ON");`
`827`	`827`	`cfg.define("LLVM_USE_STATIC_ZSTD", "TRUE");`
	`828`	`+ } else {`
	`829`	`+ cfg.define("LLVM_ENABLE_ZSTD", "OFF");`
`828`	`830`	`}`
`829`	`831`
`830`	`832`	`if let Some(ref linker) = builder.config.llvm_use_linker {`