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.70.0+dfsg1-5+rpi1^2~15
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=f75c910c052ea3602280dace45f3391109cc8a2c;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 bf34a12695..163c9dea67 100644
--- a/src/bootstrap/doc.rs
+++ b/src/bootstrap/doc.rs
@@ -612,7 +612,6 @@ fn doc_std(
             .arg(&*target_dir.to_string_lossy())
             .arg("-p")
             .arg(package)
-            .arg("-Zskip-rustdoc-fingerprint")
             .arg("--")
             .arg("-Z")
             .arg("unstable-options")
@@ -712,7 +711,6 @@ impl Step for Rustc {
         cargo.rustdocflag("--generate-link-to-definition");
         compile::rustc_cargo(builder, &mut cargo, target, compiler.stage);
         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`.
@@ -845,7 +843,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");
                 $(