Skip to content

Fix Claude env rustup setup guard#65

Merged
jssblck merged 2 commits into
mainfrom
tuna/fix-claude-env-rustup
Jun 24, 2026
Merged

Fix Claude env rustup setup guard#65
jssblck merged 2 commits into
mainfrom
tuna/fix-claude-env-rustup

Conversation

@attune-tuna

@attune-tuna attune-tuna Bot commented Jun 23, 2026

Copy link
Copy Markdown
Contributor

Summary

  • install rustup based on rustup availability, not just cargo
  • load $HOME/.cargo/env only when it exists, with a PATH fallback for rustup installs
  • explicitly install/select stable if cargo is still unavailable after rustup setup

Verification

  • bash -n scripts/setup-claude-env.sh

Follow-up to #64.

@attune-tuna

attune-tuna Bot commented Jun 23, 2026

Copy link
Copy Markdown
Contributor Author

@attune-tuna[bot] is not a member of the AttuneHQ GitHub org, so Tuna cannot run on this AttuneHQ pull request.

The cc/ort build scripts bake the active Xcode clang-runtime path (where
libclang_rt.osx.a lives) into the cached build output, but the Rust cache
key keys only on target, rustc, and the lockfile -- not the toolchain.
When macos-latest rolls to a new Xcode, a runner restoring the stale cache
links against a clang path that no longer exists and fails with
"library 'clang_rt.osx' not found". This is what broke the
Build aarch64-apple-darwin check on this PR: the same cache key that linked
fine on a main run four minutes earlier failed once a freshly-rolled runner
picked it up.

Fold the active Xcode/clang version into the macOS cache key via rust-cache
env-vars so a toolchain roll invalidates the poisoned cache automatically.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
@jssblck jssblck merged commit 96776d2 into main Jun 24, 2026
14 checks passed
@jssblck jssblck deleted the tuna/fix-claude-env-rustup branch June 24, 2026 17:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant