Skip to content

Commit fa1a0c3

Browse files
authored
Rollup merge of #147816 - Kobzol:bootstrap-download-rustc-lto, r=jieyouxu
Do not error out for `download-rustc` if LTO is configured Noted [here](#141953 (comment)). LTO should indeed be mostly a perf-only change. r? ``@jieyouxu``
2 parents 2d59f53 + ce320bb commit fa1a0c3

File tree

1 file changed

+1
-2
lines changed
  • src/bootstrap/src/core/config/toml

1 file changed

+1
-2
lines changed

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -321,7 +321,6 @@ pub fn check_incompatible_options_for_ci_rustc(
321321
debuginfo_level_rustc,
322322
llvm_tools,
323323
llvm_bitcode_linker,
324-
lto,
325324
stack_protector,
326325
strip,
327326
jemalloc,
@@ -354,6 +353,7 @@ pub fn check_incompatible_options_for_ci_rustc(
354353
save_toolstates: _,
355354
codegen_backends: _,
356355
lld: _,
356+
lto: _,
357357
deny_warnings: _,
358358
backtrace_on_ice: _,
359359
verify_llvm_ir: _,
@@ -393,7 +393,6 @@ pub fn check_incompatible_options_for_ci_rustc(
393393
err!(current_rust_config.jemalloc, jemalloc, "rust");
394394
err!(current_rust_config.default_linker, default_linker, "rust");
395395
err!(current_rust_config.stack_protector, stack_protector, "rust");
396-
err!(current_rust_config.lto, lto, "rust");
397396
err!(current_rust_config.std_features, std_features, "rust");
398397

399398
warn!(current_rust_config.channel, channel, "rust");

0 commit comments

Comments
 (0)