Skip to content

Commit

Permalink
Unrolled build for rust-lang#118650
Browse files Browse the repository at this point in the history
Rollup merge of rust-lang#118650 - RalfJung:flags-sync, r=clubby789

add comment about keeping flags in sync between bootstrap.py and bootstrap.rs

They got out of sync, probably because this comment was missing on the Python side (it only exists on the Rust side). rust-lang#118642 brings the flags back in sync but does not fix the comment, so let's do that here.

r? clubby789
  • Loading branch information
rust-timer committed Dec 6, 2023
2 parents f32d298 + 68ea621 commit a340448
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions src/bootstrap/bootstrap.py
Original file line number Diff line number Diff line change
Expand Up @@ -946,6 +946,8 @@ def build_bootstrap_cmd(self, env):
target_linker = self.get_toml("linker", build_section)
if target_linker is not None:
env["RUSTFLAGS"] += " -C linker=" + target_linker
# When changing this list, also update the corresponding list in `Builder::cargo`
# in `src/bootstrap/src/core/builder.rs`.
env["RUSTFLAGS"] += " -Wrust_2018_idioms -Wunused_lifetimes"
if self.warnings == "default":
deny_warnings = self.get_toml("deny-warnings", "rust") != "false"
Expand Down

0 comments on commit a340448

Please sign in to comment.