Skip to content

Commit 4fcb161

Browse files
cryptomilksylvestre
authored andcommitted
fix: Fix ToolchainPackager cfg gate to build on ppc64le/s390x
On Linux ppc64le/s390x, the blanket `impl<T: Send> ToolchainPackager for T` in pkg.rs is active (non-x86_64/aarch64 path), but the test-only PanicToolchainPackager impl in cache.rs was gated on only `target_os = "linux"`, causing a conflicting-impl error on those architectures.
1 parent 3a85b1a commit 4fcb161

1 file changed

Lines changed: 4 additions & 1 deletion

File tree

src/dist/cache.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,10 @@ mod client {
302302
Box::new(PanicToolchainPackager)
303303
}
304304
}
305-
#[cfg(target_os = "linux")]
305+
#[cfg(all(
306+
target_os = "linux",
307+
any(target_arch = "x86_64", target_arch = "aarch64")
308+
))]
306309
impl crate::dist::pkg::ToolchainPackager for PanicToolchainPackager {
307310
fn write_pkg(self: Box<Self>, _f: super::fs::File) -> crate::errors::Result<()> {
308311
panic!("should not have called packager")

0 commit comments

Comments
 (0)