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:40 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-17 12:20:40 +0000
commitb667bd04d7a0062c0e3fc07f480f5d66c55c0014 (patch)
treeae99acd0647b6bcb5fe608adaa66995139eb146e /debian/patches/d-bootstrap-old-cargo-compat.patch
parentMerging upstream version 1.70.0+dfsg1. (diff)
downloadrustc-b667bd04d7a0062c0e3fc07f480f5d66c55c0014.tar.xz
rustc-b667bd04d7a0062c0e3fc07f480f5d66c55c0014.zip
Merging debian version 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 @@
&[],
);