Skip to content

Commit 00b6f4e

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 + aa77c6a commit 00b6f4e

File tree

3 files changed

+3
-1
lines changed

3 files changed

+3
-1
lines changed

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 {

src/ci/github-actions/jobs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -437,7 +437,7 @@ auto:
437437

438438
- name: aarch64-apple
439439
env:
440-
SCRIPT: ./x.py --stage 2 test --host=aarch64-apple-darwin --target=aarch64-apple-darwin
440+
SCRIPT: BOOTSTRAP_TRACING=bootstrap=trace ./x.py --stage 2 test --host=aarch64-apple-darwin --target=aarch64-apple-darwin
441441
RUST_CONFIGURE_ARGS: >-
442442
--enable-sanitizers
443443
--enable-profiler

0 commit comments

Comments
 (0)