summaryrefslogtreecommitdiffstats
path: root/debian/patches/build/d-bootstrap-no-assume-tools.patch
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-06-19 09:26:01 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-06-19 09:26:01 +0000
commitc29d7c1ba10d6debd11f9d8aad5d069a6491e60e (patch)
treea2ad46eb513b315f0efd8170af5eb08870165757 /debian/patches/build/d-bootstrap-no-assume-tools.patch
parentMerging upstream version 1.76.0+dfsg1. (diff)
downloadrustc-debian/1.76.0+dfsg1-1.tar.xz
rustc-debian/1.76.0+dfsg1-1.zip
Adding debian version 1.76.0+dfsg1-1.debian/1.76.0+dfsg1-1debian
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian/patches/build/d-bootstrap-no-assume-tools.patch')
-rw-r--r--debian/patches/build/d-bootstrap-no-assume-tools.patch28
1 files changed, 28 insertions, 0 deletions
diff --git a/debian/patches/build/d-bootstrap-no-assume-tools.patch b/debian/patches/build/d-bootstrap-no-assume-tools.patch
new file mode 100644
index 000000000..512e6a9cd
--- /dev/null
+++ b/debian/patches/build/d-bootstrap-no-assume-tools.patch
@@ -0,0 +1,28 @@
+From: Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
+Date: Thu, 14 Jul 2022 13:17:39 +0200
+Subject: set tools to those built in Debian
+
+Forwarded: not-needed
+===================================================================
+---
+ src/bootstrap/src/tests/builder.rs | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/bootstrap/src/tests/builder.rs b/src/bootstrap/src/tests/builder.rs
+index 700ebcf..bf31009 100644
+--- a/src/bootstrap/src/tests/builder.rs
++++ b/src/bootstrap/src/tests/builder.rs
+@@ -374,9 +374,13 @@ mod dist {
+ #[test]
+ fn dist_only_cross_host() {
+ let b = TargetSelection::from_user("B");
++ let mut tools = std::collections::HashSet::new();
++ tools.insert("clippy".to_string());
++ tools.insert("rustfmt".to_string());
+ let mut config = configure(&["A", "B"], &["A", "B"]);
+ config.docs = false;
+ config.extended = true;
++ config.tools = Some(tools);
+ config.hosts = vec![b];
+ let mut cache = run_build(&[], config);
+