From 4d4fb2784f59700f9bc35f2a3a4c60dbf3464504 Mon Sep 17 00:00:00 2001
From: bjorn3 <17426603+bjorn3@users.noreply.github.com>
Date: Sat, 17 Jan 2026 16:03:18 +0000
Subject: [PATCH] Pass -Zbinary-dep-depinfo when testing rustc tests

---
 scripts/setup_rust_fork.sh | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/scripts/setup_rust_fork.sh b/scripts/setup_rust_fork.sh
index c16cb4e538fe..9d618554cb4f 100644
--- a/scripts/setup_rust_fork.sh
+++ b/scripts/setup_rust_fork.sh
@@ -49,6 +49,19 @@ std-features = ["panic-unwind"]
 EOF
 
 cat <<EOF | git apply -
+diff --git a/src/bootstrap/bootstrap.py b/src/bootstrap/bootstrap.py
+index 2e16f2cf27..3ac3df99a8 100644
+--- a/src/bootstrap/bootstrap.py
++++ b/src/bootstrap/bootstrap.py
+@@ -1147,6 +1147,8 @@ class RustBuild(object):
+             args += ["-Zwarnings"]
+             env["CARGO_BUILD_WARNINGS"] = "deny"
+
++        env["RUSTFLAGS"] += " -Zbinary-dep-depinfo"
++
+         # Add RUSTFLAGS_BOOTSTRAP to RUSTFLAGS for bootstrap compilation.
+         # Note that RUSTFLAGS_BOOTSTRAP should always be added to the end of
+         # RUSTFLAGS, since that causes RUSTFLAGS_BOOTSTRAP to override RUSTFLAGS.
 diff --git a/src/bootstrap/src/core/config/config.rs b/src/bootstrap/src/core/config/config.rs
 index a656927b1f6..44fc5546fac 100644
 --- a/src/bootstrap/src/core/config/config.rs