Revert zlib configuration changes.

rust-lang · Aug 8, 2024 · 4759087 · 4759087
1 parent aff884a
commit 4759087
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/src/bootstrap/src/core/build_steps/llvm.rs b/src/bootstrap/src/core/build_steps/llvm.rs
@@ -368,6 +368,13 @@ impl Step for Llvm {
             cfg.define("LLVM_PROFDATA_FILE", path);
         }
 
+        // Libraries for ELF section compression.
+        if !target.is_windows() {
+            cfg.define("LLVM_ENABLE_ZLIB", "ON");
+        } else {
+            cfg.define("LLVM_ENABLE_ZLIB", "OFF");
+        }
+
         // Are we compiling for iOS/tvOS/watchOS/visionOS?
         if target.contains("apple-ios")
             || target.contains("apple-tvos")
@@ -816,12 +823,6 @@ fn configure_llvm(builder: &Builder<'_>, target: TargetSelection, cfg: &mut cmak
     }
 
     // Libraries for ELF section compression.
-    if !target.is_windows() {
-        cfg.define("LLVM_ENABLE_ZLIB", "ON");
-    } else {
-        cfg.define("LLVM_ENABLE_ZLIB", "OFF");
-    }
-
     if builder.config.llvm_libzstd {
         cfg.define("LLVM_ENABLE_ZSTD", "FORCE_ON");
         cfg.define("LLVM_USE_STATIC_ZSTD", "TRUE");