Skip to content

Commit 4759087

Browse files
committed
Revert zlib configuration changes.
1 parent aff884a commit 4759087

File tree

1 file changed

+7
-6
lines changed
  • src/bootstrap/src/core/build_steps

1 file changed

+7
-6
lines changed

src/bootstrap/src/core/build_steps/llvm.rs

+7-6
Original file line numberDiff line numberDiff line change
@@ -368,6 +368,13 @@ impl Step for Llvm {
368368
cfg.define("LLVM_PROFDATA_FILE", path);
369369
}
370370

371+
// Libraries for ELF section compression.
372+
if !target.is_windows() {
373+
cfg.define("LLVM_ENABLE_ZLIB", "ON");
374+
} else {
375+
cfg.define("LLVM_ENABLE_ZLIB", "OFF");
376+
}
377+
371378
// Are we compiling for iOS/tvOS/watchOS/visionOS?
372379
if target.contains("apple-ios")
373380
|| target.contains("apple-tvos")
@@ -816,12 +823,6 @@ fn configure_llvm(builder: &Builder<'_>, target: TargetSelection, cfg: &mut cmak
816823
}
817824

818825
// Libraries for ELF section compression.
819-
if !target.is_windows() {
820-
cfg.define("LLVM_ENABLE_ZLIB", "ON");
821-
} else {
822-
cfg.define("LLVM_ENABLE_ZLIB", "OFF");
823-
}
824-
825826
if builder.config.llvm_libzstd {
826827
cfg.define("LLVM_ENABLE_ZSTD", "FORCE_ON");
827828
cfg.define("LLVM_USE_STATIC_ZSTD", "TRUE");

0 commit comments

Comments
 (0)