Skip to content

Commit

Permalink
Revert zlib configuration changes.
Browse files Browse the repository at this point in the history
  • Loading branch information
khuey committed Aug 8, 2024
1 parent aff884a commit 4759087
Showing 1 changed file with 7 additions and 6 deletions.
13 changes: 7 additions & 6 deletions src/bootstrap/src/core/build_steps/llvm.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down Expand Up @@ -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");
Expand Down

0 comments on commit 4759087

Please sign in to comment.