@@ -268,7 +268,6 @@ pub struct Config {
268
268
pub rust_debuginfo_level_std : DebuginfoLevel ,
269
269
pub rust_debuginfo_level_tools : DebuginfoLevel ,
270
270
pub rust_debuginfo_level_tests : DebuginfoLevel ,
271
- pub rust_split_debuginfo_for_build_triple : Option < SplitDebuginfo > , // FIXME: Deprecated field. Remove in Q3'24.
272
271
pub rust_rpath : bool ,
273
272
pub rust_strip : bool ,
274
273
pub rust_frame_pointers : bool ,
@@ -1097,7 +1096,6 @@ define_config! {
1097
1096
debuginfo_level_std: Option <DebuginfoLevel > = "debuginfo-level-std" ,
1098
1097
debuginfo_level_tools: Option <DebuginfoLevel > = "debuginfo-level-tools" ,
1099
1098
debuginfo_level_tests: Option <DebuginfoLevel > = "debuginfo-level-tests" ,
1100
- split_debuginfo: Option <String > = "split-debuginfo" ,
1101
1099
backtrace: Option <bool > = "backtrace" ,
1102
1100
incremental: Option <bool > = "incremental" ,
1103
1101
parallel_compiler: Option <bool > = "parallel-compiler" ,
@@ -1625,7 +1623,6 @@ impl Config {
1625
1623
debuginfo_level_std : debuginfo_level_std_toml,
1626
1624
debuginfo_level_tools : debuginfo_level_tools_toml,
1627
1625
debuginfo_level_tests : debuginfo_level_tests_toml,
1628
- split_debuginfo,
1629
1626
backtrace,
1630
1627
incremental,
1631
1628
parallel_compiler,
@@ -1684,18 +1681,6 @@ impl Config {
1684
1681
debuginfo_level_tests = debuginfo_level_tests_toml;
1685
1682
lld_enabled = lld_enabled_toml;
1686
1683
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
-
1699
1684
optimize = optimize_toml;
1700
1685
omit_git_hash = omit_git_hash_toml;
1701
1686
config. rust_new_symbol_mangling = new_symbol_mangling;
@@ -2493,9 +2478,6 @@ impl Config {
2493
2478
self . target_config
2494
2479
. get ( & target)
2495
2480
. and_then ( |t| t. split_debuginfo )
2496
- . or_else ( || {
2497
- if self . build == target { self . rust_split_debuginfo_for_build_triple } else { None }
2498
- } )
2499
2481
. unwrap_or_else ( || SplitDebuginfo :: default_for_platform ( target) )
2500
2482
}
2501
2483
@@ -2916,7 +2898,6 @@ fn check_incompatible_options_for_ci_rustc(
2916
2898
debuginfo_level_std : _,
2917
2899
debuginfo_level_tools : _,
2918
2900
debuginfo_level_tests : _,
2919
- split_debuginfo : _,
2920
2901
backtrace : _,
2921
2902
parallel_compiler : _,
2922
2903
musl_root : _,
0 commit comments