Skip to content

Move llvm.ccache to build.ccache - #136941

Merged
bors merged 3 commits into
rust-lang:masterfrom
Kobzol:ccache-build
Feb 14, 2025
Merged

Move llvm.ccache to build.ccache#136941
bors merged 3 commits into
rust-lang:masterfrom
Kobzol:ccache-build

Conversation

@Kobzol

@KobzolKobzol commented Feb 12, 2025

Copy link
Copy Markdown
Member

(S)ccache can be useful for more things that just LLVM. For example, we will soon want to use it also for GCC, and theoretically also for building stage0 Rust tools (#136921, https://rust-lang.zulipchat.com/#narrow/channel/242791-t-infra/topic/Using.20sccache.20for.20Rust).

r? @onur-ozkan

@rustbotrustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) labels Feb 12, 2025
@rustbot

rustbot commented Feb 12, 2025

Copy link
Copy Markdown
Collaborator

This PR modifies config.example.toml.

If appropriate, please update CONFIG_CHANGE_HISTORY in src/bootstrap/src/utils/change_tracker.rs.

This PR modifies src/bootstrap/src/core/config.

If appropriate, please update CONFIG_CHANGE_HISTORY in src/bootstrap/src/utils/change_tracker.rs.

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@Kobzol
Move llvm.ccache to build.ccache
e663819
(S)ccache can be useful for more things that just LLVM. For example, we will soon want to use it also for GCC, and theoretically also for building stage0 Rust tools.
onur-ozkan
onur-ozkan reviewed Feb 13, 2025
View reviewed changes

@onur-ozkanonur-ozkan left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We need another FIXME on llvm.ccache in config.rs, something like

// FIXME: Remove this field at Q2

Comment threadconfig.example.toml
Comment threadsrc/bootstrap/configure.py
Comment threadsrc/bootstrap/src/core/config/config.rs
@onur-ozkanonur-ozkan added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Feb 13, 2025
@Kobzol

Kobzol commented Feb 13, 2025

Copy link
Copy Markdown
MemberAuthor

Removed llvm.ccache from config.example.toml.

@rustbot ready

@rustbotrustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Feb 13, 2025
@onur-ozkan

onur-ozkan commented Feb 13, 2025

Copy link
Copy Markdown
Contributor

@bors r+

@bors

bors commented Feb 13, 2025

Copy link
Copy Markdown
Collaborator

📌 Commit bd4f80c has been approved by onur-ozkan

It is now in the queue for this repository.

@borsbors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Feb 13, 2025
workingjubilee added a commit to workingjubilee/rustc that referenced this pull request Feb 14, 2025
@workingjubilee
Rollup merge ofrust-lang#136941- Kobzol:ccache-build, r=onur-ozkan
235af9c
Move `llvm.ccache` to `build.ccache`
(S)ccache can be useful for more things that just LLVM. For example, we will soon want to use it also for GCC, and theoretically also for building stage0 Rust tools (rust-lang#136921, https://rust-lang.zulipchat.com/#narrow/channel/242791-t-infra/topic/Using.20sccache.20for.20Rust).
r? `@onur-ozkan`
This was referenced Feb 14, 2025
Closed
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 14, 2025
@bors
Auto merge ofrust-lang#137001- workingjubilee:rollup-u3dn4gc, r=wor…
6dfeab5
…kingjubilee
Rollup of 11 pull requests
Successful merges:
- rust-lang#136863 (rework rigid alias handling )
- rust-lang#136869 (Fix diagnostic when using = instead of : in let binding)
- rust-lang#136895 (debuginfo: Set bitwidth appropriately in enum variant tags)
- rust-lang#136928 (eagerly prove WF when resolving fully qualified paths)
- rust-lang#136941 (Move `llvm.ccache` to `build.ccache`)
- rust-lang#136950 (rustdoc: use better, consistent SVG icons for scraped examples)
- rust-lang#136957 (coverage: Eliminate more counters by giving them to unreachable nodes)
- rust-lang#136960 (Compiletest should not inherit all host RUSTFLAGS)
- rust-lang#136962 (unify LLVM version finding logic)
- rust-lang#136970 (ci: move `x86_64-gnu-debug` job to the free runner)
- rust-lang#136973 (Fix `x test --stage 1 ui-fulldeps` on macOS (until the next beta bump))
r? `@ghost`
`@rustbot` modify labels: rollup
@bors
bors merged commit 9f87de6 into rust-lang:masterFeb 14, 2025
@rustbotrustbot added this to the 1.86.0 milestone Feb 14, 2025
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Feb 14, 2025
@rust-timer
Unrolled build forrust-lang#136941
6e660f5
Rollup merge of rust-lang#136941 - Kobzol:ccache-build, r=onur-ozkan
Move `llvm.ccache` to `build.ccache`
(S)ccache can be useful for more things that just LLVM. For example, we will soon want to use it also for GCC, and theoretically also for building stage0 Rust tools (rust-lang#136921, https://rust-lang.zulipchat.com/#narrow/channel/242791-t-infra/topic/Using.20sccache.20for.20Rust).
r? ``@onur-ozkan``
@Kobzol
Kobzol deleted the ccache-build branch February 14, 2025 07:33
@klensyklensy mentioned this pull request Feb 26, 2025
Merged
TheBlindArchitect pushed a commit to XSLabs/integration that referenced this pull request Jul 30, 2025
Aidan Wolter@copybara-github
[roll] Roll infra/recipes [rust] Move ccache from llvm to build
37ad614
Broken from upstream: rust-lang/rust#136941
Original-Bug: 432480497
Original-Reviewed-on: https://fuchsia-review.googlesource.com/c/infra/recipes/+/1324429
Original-Revision: 74085b2bdfdb72f4e2ca29864c211a8954767643
GitOrigin-RevId: cbd36a608d4067fbc02cf7676c7f1d6ab96ab86c
Change-Id: I4acf15811082957d7d657a1af2bccae28a44a6f7
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer
@onur-ozkanonur-ozkanonur-ozkan left review comments
Reviewers whose approvals may not affect merge requirements

Assignees

@onur-ozkanonur-ozkan

Labels

S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-bootstrapRelevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)

Projects

None yet

Milestone

1.86.0

Development

Successfully merging this pull request may close these issues.

5 participants

@Kobzol@rustbot@rust-log-analyzer@onur-ozkan@bors