Auto merge of #118787 - GuillaumeGomez:rollup-fj5wr3q, r=GuillaumeGomez · rust-lang/rust@f7253f2 (original) (raw)

`@@ -223,6 +223,8 @@ pub struct Config {

`

223

223

`pub rust_debuginfo_level_tests: DebuginfoLevel,

`

224

224

`pub rust_split_debuginfo: SplitDebuginfo,

`

225

225

`pub rust_rpath: bool,

`

``

226

`+

pub rust_strip: bool,

`

``

227

`+

pub rust_stack_protector: Option,

`

226

228

`pub rustc_parallel: bool,

`

227

229

`pub rustc_default_linker: Option,

`

228

230

`pub rust_optimize_tests: bool,

`

`@@ -1002,6 +1004,8 @@ define_config! {

`

1002

1004

` description: Option = "description",

`

1003

1005

` musl_root: Option = "musl-root",

`

1004

1006

` rpath: Option = "rpath",

`

``

1007

`+

strip: Option = "strip",

`

``

1008

`+

stack_protector: Option = "stack-protector",

`

1005

1009

` verbose_tests: Option = "verbose-tests",

`

1006

1010

` optimize_tests: Option = "optimize-tests",

`

1007

1011

` codegen_tests: Option = "codegen-tests",

`

`@@ -1071,6 +1075,7 @@ impl Config {

`

1071

1075

` config.docs = true;

`

1072

1076

` config.docs_minification = true;

`

1073

1077

` config.rust_rpath = true;

`

``

1078

`+

config.rust_strip = false;

`

1074

1079

` config.channel = "dev".to_string();

`

1075

1080

` config.codegen_tests = true;

`

1076

1081

` config.rust_dist_src = true;

`

`@@ -1425,6 +1430,8 @@ impl Config {

`

1425

1430

`set(&mut config.rust_optimize_tests, rust.optimize_tests);

`

1426

1431

`set(&mut config.codegen_tests, rust.codegen_tests);

`

1427

1432

`set(&mut config.rust_rpath, rust.rpath);

`

``

1433

`+

set(&mut config.rust_strip, rust.strip);

`

``

1434

`+

config.rust_stack_protector = rust.stack_protector;

`

1428

1435

`set(&mut config.jemalloc, rust.jemalloc);

`

1429

1436

`set(&mut config.test_compare_mode, rust.test_compare_mode);

`

1430

1437

`set(&mut config.backtrace, rust.backtrace);

`