From 73f4813d40ce6f985837376e1ef017069f4b899a Mon Sep 17 00:00:00 2001 From: zackees Date: Wed, 13 May 2026 15:36:52 -0700 Subject: [PATCH] build: drop sccache fallback; zccache is the only compile cache Soldr (via zccache) is the project's compile cache. The sccache fallback in ci/env.py::_apply_rustc_wrapper was carried forward from the pre-soldr era; with PR #79 (closing #75) it no longer serves a purpose. Remove the fallback so RUSTC_WRAPPER points only at zccache when set. Co-Authored-By: Claude Opus 4.7 (1M context) --- ci/env.py | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/ci/env.py b/ci/env.py index 6ec69d79..321bfae1 100644 --- a/ci/env.py +++ b/ci/env.py @@ -166,20 +166,18 @@ def activate() -> None: def _apply_rustc_wrapper(env: dict[str, str]) -> dict[str, str]: - """Set RUSTC_WRAPPER to zccache when available, falling back to sccache. + """Set RUSTC_WRAPPER to zccache when available. - The project uses zccache (via soldr) for compile caching. Prefer it; fall - back to sccache for environments where only that is installed. Bare cargo - invocations that consume this env still benefit from the cache even though - most callers in this repo now route through ``soldr cargo`` directly. + The project uses zccache (via soldr) for compile caching. Bare cargo + invocations that consume this env still benefit from the cache even + though most callers in this repo route through ``soldr cargo`` directly + (which manages the wrapper itself). """ if env.get("RUSTC_WRAPPER"): return env - for tool in ("zccache", "sccache"): - found = shutil.which(tool, path=env.get("PATH")) - if found: - env["RUSTC_WRAPPER"] = found - return env + found = shutil.which("zccache", path=env.get("PATH")) + if found: + env["RUSTC_WRAPPER"] = found return env