Skip to content

Commit ef1b87c

Browse files
committed
remove deprecated option rust.split-debuginfo
Signed-off-by: onur-ozkan <[email protected]>
1 parent 0d63418 commit ef1b87c

File tree

1 file changed

+0
-19
lines changed

1 file changed

+0
-19
lines changed

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

-19
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,6 @@ pub struct Config {
268268
pub rust_debuginfo_level_std: DebuginfoLevel,
269269
pub rust_debuginfo_level_tools: DebuginfoLevel,
270270
pub rust_debuginfo_level_tests: DebuginfoLevel,
271-
pub rust_split_debuginfo_for_build_triple: Option<SplitDebuginfo>, // FIXME: Deprecated field. Remove in Q3'24.
272271
pub rust_rpath: bool,
273272
pub rust_strip: bool,
274273
pub rust_frame_pointers: bool,
@@ -1097,7 +1096,6 @@ define_config! {
10971096
debuginfo_level_std: Option<DebuginfoLevel> = "debuginfo-level-std",
10981097
debuginfo_level_tools: Option<DebuginfoLevel> = "debuginfo-level-tools",
10991098
debuginfo_level_tests: Option<DebuginfoLevel> = "debuginfo-level-tests",
1100-
split_debuginfo: Option<String> = "split-debuginfo",
11011099
backtrace: Option<bool> = "backtrace",
11021100
incremental: Option<bool> = "incremental",
11031101
parallel_compiler: Option<bool> = "parallel-compiler",
@@ -1625,7 +1623,6 @@ impl Config {
16251623
debuginfo_level_std: debuginfo_level_std_toml,
16261624
debuginfo_level_tools: debuginfo_level_tools_toml,
16271625
debuginfo_level_tests: debuginfo_level_tests_toml,
1628-
split_debuginfo,
16291626
backtrace,
16301627
incremental,
16311628
parallel_compiler,
@@ -1684,18 +1681,6 @@ impl Config {
16841681
debuginfo_level_tests = debuginfo_level_tests_toml;
16851682
lld_enabled = lld_enabled_toml;
16861683

1687-
config.rust_split_debuginfo_for_build_triple = split_debuginfo
1688-
.as_deref()
1689-
.map(SplitDebuginfo::from_str)
1690-
.map(|v| v.expect("invalid value for rust.split-debuginfo"));
1691-
1692-
if config.rust_split_debuginfo_for_build_triple.is_some() {
1693-
println!(
1694-
"WARNING: specifying `rust.split-debuginfo` is deprecated, use `target.{}.split-debuginfo` instead",
1695-
config.build
1696-
);
1697-
}
1698-
16991684
optimize = optimize_toml;
17001685
omit_git_hash = omit_git_hash_toml;
17011686
config.rust_new_symbol_mangling = new_symbol_mangling;
@@ -2493,9 +2478,6 @@ impl Config {
24932478
self.target_config
24942479
.get(&target)
24952480
.and_then(|t| t.split_debuginfo)
2496-
.or_else(|| {
2497-
if self.build == target { self.rust_split_debuginfo_for_build_triple } else { None }
2498-
})
24992481
.unwrap_or_else(|| SplitDebuginfo::default_for_platform(target))
25002482
}
25012483

@@ -2916,7 +2898,6 @@ fn check_incompatible_options_for_ci_rustc(
29162898
debuginfo_level_std: _,
29172899
debuginfo_level_tools: _,
29182900
debuginfo_level_tests: _,
2919-
split_debuginfo: _,
29202901
backtrace: _,
29212902
parallel_compiler: _,
29222903
musl_root: _,

0 commit comments

Comments
 (0)