Skip to content

Commit 2ae0ed3

Browse files
Re-enable zlib-ng on all platforms (except s390x, PowerPC, and FreeBSD) (#10370)
PowerPC seems to build without errors if we upgrade `zlib-ng`, but upgrading `zlib-ng` causes Windows to break (rust-lang/libz-sys#225), and Cargo doesn't let us include two different versions. s390x fails because it can't find `stfle`. It's possible that we could fix this by by upgrading our manylinux version and/or by upgrading GCC (which may necessitate upgrading our manylinux version), but I don't know if it's fixable without one of those things? And it's not worth bumping compatibility for that reason. \cc @konstin
1 parent a2a2662 commit 2ae0ed3

File tree

2 files changed

+45
-3
lines changed

2 files changed

+45
-3
lines changed

crates/uv-performance-flate2-backend/Cargo.lock

Lines changed: 42 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

crates/uv-performance-flate2-backend/Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@ edition = "2021"
77
[lib]
88
doctest = false
99

10-
# Use `zlib-ng` on x86_64 targets, apart from FreeBSD.
11-
[target.'cfg(all(target_arch = "x86_64", not(target_os = "freebsd")))'.dependencies]
10+
# Use `zlib-ng` on all supported platforms.
11+
[target.'cfg(not(any(target_arch = "s390x", target_arch = "powerpc64", target_os = "freebsd")))'.dependencies]
1212
flate2 = { version = "1.0.28", default-features = false, features = ["zlib-ng"] }
1313
# See: https://github.com/rust-lang/libz-sys/issues/225
1414
libz-ng-sys = { version = "<1.1.20" }
1515

1616
# Use `zlib-rs` everywhere else.
17-
[target.'cfg(not(all(target_arch = "x86_64", not(target_os = "freebsd"))))'.dependencies]
17+
[target.'cfg(any(target_arch = "s390x", target_arch = "powerpc64", target_os = "freebsd"))'.dependencies]
1818
flate2 = { version = "1.0.28", default-features = false, features = ["zlib-rs"] }

0 commit comments

Comments
 (0)