From: Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
Date: Thu, 14 Jul 2022 11:17:39 +0000 (+0200)
Subject: set tools to those built in Debian
X-Git-Tag: archive/raspbian/1.84.0+dfsg1-2+rpi1^2~25
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=bc5dbcbc2bccbac7c2b9e08c9dbd360f5e7e72c4;p=rustc.git

set tools to those built in Debian

Forwarded: not-needed
===================================================================

Gbp-Pq: Topic build
Gbp-Pq: Name d-bootstrap-no-assume-tools.patch
---

diff --git a/src/bootstrap/src/core/builder/tests.rs b/src/bootstrap/src/core/builder/tests.rs
index 21c5f7232a..d6580fe1ac 100644
--- a/src/bootstrap/src/core/builder/tests.rs
+++ b/src/bootstrap/src/core/builder/tests.rs
@@ -435,10 +435,14 @@ mod dist {
     #[test]
     fn dist_only_cross_host() {
         let b = TargetSelection::from_user("B-B");
+        let mut tools = std::collections::HashSet::new();
+        tools.insert("clippy".to_string());
+        tools.insert("rustfmt".to_string());
         let mut config = configure(&["A-A", "B-B"], &["A-A", "B-B"]);
         config.docs = false;
         config.extended = true;
         config.hosts = vec![b];
+        config.tools = Some(tools);
         let mut cache = run_build(&[], config);
 
         assert_eq!(first(cache.all::<dist::Rustc>()), &[dist::Rustc {