From 7e13e2f2600bfefd6ddaf6b9e0a51707da3fc831 Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@cryptomilk.org>
Date: Tue, 23 Jun 2026 08:51:27 +0200
Subject: [PATCH] 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.
---
 src/dist/cache.rs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/dist/cache.rs b/src/dist/cache.rs
index 72e9c3d66..e5db21b72 100644
--- a/src/dist/cache.rs
+++ b/src/dist/cache.rs
@@ -302,7 +302,10 @@ mod client {
                 Box::new(PanicToolchainPackager)
             }
         }
-        #[cfg(target_os = "linux")]
+        #[cfg(all(
+            target_os = "linux",
+            any(target_arch = "x86_64", target_arch = "aarch64")
+        ))]
         impl crate::dist::pkg::ToolchainPackager for PanicToolchainPackager {
             fn write_pkg(self: Box<Self>, _f: super::fs::File) -> crate::errors::Result<()> {
                 panic!("should not have called packager")