Skip to content

Commit a340448

Browse files
authored
Unrolled build for rust-lang#118650
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
2 parents f32d298 + 68ea621 commit a340448

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

src/bootstrap/bootstrap.py

+2
Original file line numberDiff line numberDiff line change
@@ -946,6 +946,8 @@ def build_bootstrap_cmd(self, env):
946946
target_linker = self.get_toml("linker", build_section)
947947
if target_linker is not None:
948948
env["RUSTFLAGS"] += " -C linker=" + target_linker
949+
# When changing this list, also update the corresponding list in `Builder::cargo`
950+
# in `src/bootstrap/src/core/builder.rs`.
949951
env["RUSTFLAGS"] += " -Wrust_2018_idioms -Wunused_lifetimes"
950952
if self.warnings == "default":
951953
deny_warnings = self.get_toml("deny-warnings", "rust") != "false"

0 commit comments

Comments
 (0)