summaryrefslogtreecommitdiffstats
path: root/debian/patches/d-bootstrap-old-cargo-compat.patch
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-17 12:20:37 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-17 12:20:37 +0000
commit2d0ec380bae2ec8d51b6193fee6577188c6bb2ec (patch)
tree00f9136b2844d7e9ddc861b845ccc309aaa6091a /debian/patches/d-bootstrap-old-cargo-compat.patch
parentMerging upstream version 1.70.0+dfsg1. (diff)
downloadrustc-2d0ec380bae2ec8d51b6193fee6577188c6bb2ec.tar.xz
rustc-2d0ec380bae2ec8d51b6193fee6577188c6bb2ec.zip
Adding debian version 1.70.0+dfsg1-7.debian/1.70.0+dfsg1-7
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian/patches/d-bootstrap-old-cargo-compat.patch')
-rw-r--r--debian/patches/d-bootstrap-old-cargo-compat.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/debian/patches/d-bootstrap-old-cargo-compat.patch b/debian/patches/d-bootstrap-old-cargo-compat.patch
index 463e70369..a077e0c8f 100644
--- a/debian/patches/d-bootstrap-old-cargo-compat.patch
+++ b/debian/patches/d-bootstrap-old-cargo-compat.patch
@@ -17,7 +17,7 @@ Subject: Backwards-compat for cargo 0.47
--- a/src/bootstrap/doc.rs
+++ b/src/bootstrap/doc.rs
-@@ -598,7 +598,6 @@
+@@ -612,7 +612,6 @@
.arg(&*target_dir.to_string_lossy())
.arg("-p")
.arg(package)
@@ -25,15 +25,15 @@ Subject: Backwards-compat for cargo 0.47
.arg("--")
.arg("-Z")
.arg("unstable-options")
-@@ -695,7 +694,6 @@
+@@ -712,7 +711,6 @@
cargo.rustdocflag("--generate-link-to-definition");
- compile::rustc_cargo(builder, &mut cargo, target);
+ 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`.
-@@ -811,7 +809,6 @@
+@@ -845,7 +843,6 @@
&[],
);