From: Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
Date: Thu, 14 Jul 2022 11:17:39 +0000 (+0200)
Subject: Backwards-compat for cargo 0.47
X-Git-Tag: archive/raspbian/1.65.0+dfsg1-2+rpi1^2~15
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=28ff2952e8f3feb1447c20ac8365a1dc94d270c5;p=rustc.git

Backwards-compat for cargo 0.47

  The flag being removed here was added in
  https://github.com/rust-lang/cargo/pull/9404 released in cargo 0.54

  This works around a feature introduced in this PR
  https://github.com/rust-lang/cargo/pull/8640 released in cargo 0.53

  Therefore it is not needed for Debian's current cargo 0.47.

  We can drop this patch when updating to cargo 0.54 and later.

Gbp-Pq: Name d-bootstrap-old-cargo-compat.patch
---

diff --git a/src/bootstrap/doc.rs b/src/bootstrap/doc.rs
index 9135ce8f35..8d6238ac03 100644
--- a/src/bootstrap/doc.rs
+++ b/src/bootstrap/doc.rs
@@ -446,7 +446,6 @@ impl Step for Std {
             cargo
                 .arg("-p")
                 .arg(package)
-                .arg("-Zskip-rustdoc-fingerprint")
                 .arg("--")
                 .arg("--markdown-css")
                 .arg("rust.css")
@@ -590,7 +589,6 @@ impl Step for Rustc {
         cargo.rustdocflag("--generate-link-to-definition");
         compile::rustc_cargo(builder, &mut cargo, target);
         cargo.arg("-Zunstable-options");
-        cargo.arg("-Zskip-rustdoc-fingerprint");
 
         // Only include compiler crates, no dependencies of those, such as `libc`.
         // Do link to dependencies on `docs.rs` however using `rustdoc-map`.
@@ -712,7 +710,6 @@ macro_rules! tool_doc {
                     &[],
                 );
 
-                cargo.arg("-Zskip-rustdoc-fingerprint");
                 // Only include compiler crates, no dependencies of those, such as `libc`.
                 cargo.arg("--no-deps");
                 $(