Skip to content

Commit 96c2868

Browse files
committed
Auto merge of #138201 - jieyouxu:bootstrap-cycle, r=<try>
[DO NOT MERGE] debugging bootstrap cycle (too) r? ghost try-job: aarch64-apple
2 parents f5a1ef7 + 1283498 commit 96c2868

File tree

3 files changed

+5
-2
lines changed

3 files changed

+5
-2
lines changed

src/bootstrap/bootstrap.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1130,8 +1130,9 @@ def build_bootstrap_cmd(self, env):
11301130
]
11311131
args.extend("--verbose" for _ in range(self.verbose))
11321132

1133-
if "BOOTSTRAP_TRACING" in env:
1134-
args.append("--features=tracing")
1133+
#if "BOOTSTRAP_TRACING" in env:
1134+
args.append("--features=tracing")
1135+
env["BOOTSTRAP_TRACING"] = "bootstrap=trace"
11351136

11361137
if self.use_locked_deps:
11371138
args.append("--locked")

src/bootstrap/src/core/builder/mod.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1500,6 +1500,7 @@ impl<'a> Builder<'a> {
15001500
let mut out = String::new();
15011501
out += &format!("\n\nCycle in build detected when adding {step:?}\n");
15021502
for el in stack.iter().rev() {
1503+
let el = el as &dyn Any;
15031504
out += &format!("\t{el:?}\n");
15041505
}
15051506
panic!("{}", out);

src/bootstrap/src/core/config/config.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ pub(crate) const RUSTC_IF_UNCHANGED_ALLOWED_PATHS: &[&str] = &[
4848
":!src/rustdoc-json-types",
4949
":!tests",
5050
":!triagebot.toml",
51+
":!src/bootstrap",
5152
];
5253

5354
macro_rules! check_ci_llvm {

0 commit comments

Comments
 (0)