Skip to content

Commit 9085c17

Browse files
committed
remove ccache from llvm
1 parent 6cbf886 commit 9085c17

File tree

2 files changed

+3
-17
lines changed

2 files changed

+3
-17
lines changed

src/bootstrap/src/core/config/config.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -749,7 +749,7 @@ impl Config {
749749
compiletest_diff_tool,
750750
compiletest_use_stage0_libtest,
751751
tidy_extra_checks,
752-
mut ccache,
752+
ccache,
753753
exclude,
754754
} = toml.build.unwrap_or_default();
755755

@@ -963,7 +963,7 @@ impl Config {
963963
config.channel = channel;
964964
}
965965

966-
config.apply_llvm_config(toml.llvm, &mut ccache);
966+
config.apply_llvm_config(toml.llvm);
967967

968968
config.apply_gcc_config(toml.gcc);
969969

src/bootstrap/src/core/config/toml/llvm.rs

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@ define_config! {
1717
tests: Option<bool> = "tests",
1818
enzyme: Option<bool> = "enzyme",
1919
plugins: Option<bool> = "plugins",
20-
// FIXME: Remove this field at Q2 2025, it has been replaced by build.ccache
21-
ccache: Option<StringOrBool> = "ccache",
2220
static_libstdcpp: Option<bool> = "static-libstdcpp",
2321
libzstd: Option<bool> = "libzstd",
2422
ninja: Option<bool> = "ninja",
@@ -97,7 +95,6 @@ pub fn check_incompatible_options_for_ci_llvm(
9795
assertions: _,
9896
tests: _,
9997
plugins,
100-
ccache: _,
10198
static_libstdcpp: _,
10299
libzstd,
103100
ninja: _,
@@ -149,11 +146,7 @@ pub fn check_incompatible_options_for_ci_llvm(
149146
}
150147

151148
impl Config {
152-
pub fn apply_llvm_config(
153-
&mut self,
154-
toml_llvm: Option<Llvm>,
155-
ccache: &mut Option<StringOrBool>,
156-
) {
149+
pub fn apply_llvm_config(&mut self, toml_llvm: Option<Llvm>) {
157150
let mut llvm_tests = None;
158151
let mut llvm_enzyme = None;
159152
let mut llvm_offload = None;
@@ -168,7 +161,6 @@ impl Config {
168161
tests,
169162
enzyme,
170163
plugins,
171-
ccache: llvm_ccache,
172164
static_libstdcpp,
173165
libzstd,
174166
ninja,
@@ -191,13 +183,7 @@ impl Config {
191183
download_ci_llvm,
192184
build_config,
193185
} = llvm;
194-
if llvm_ccache.is_some() {
195-
eprintln!("Warning: llvm.ccache is deprecated. Use build.ccache instead.");
196-
}
197186

198-
if ccache.is_none() {
199-
*ccache = llvm_ccache;
200-
}
201187
set(&mut self.ninja_in_file, ninja);
202188
llvm_tests = tests;
203189
llvm_enzyme = enzyme;

0 commit comments

Comments
 (0)