summaryrefslogtreecommitdiffstats
path: root/debian/patches/d-bootstrap-disable-git.patch
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-05-18 02:49:47 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-05-18 02:49:47 +0000
commit9a1b5b5113f0fe12f83b7cedc2353ad41cc837b1 (patch)
tree3f4102a262698a69127c4c527a3efe30a13ac7df /debian/patches/d-bootstrap-disable-git.patch
parentMerging upstream version 1.71.1+dfsg1. (diff)
downloadrustc-9a1b5b5113f0fe12f83b7cedc2353ad41cc837b1.tar.xz
rustc-9a1b5b5113f0fe12f83b7cedc2353ad41cc837b1.zip
Adding debian version 1.71.1+dfsg1-1.debian/1.71.1+dfsg1-1
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian/patches/d-bootstrap-disable-git.patch')
-rw-r--r--debian/patches/d-bootstrap-disable-git.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/debian/patches/d-bootstrap-disable-git.patch b/debian/patches/d-bootstrap-disable-git.patch
index d7618adfe..4cd8bc1cd 100644
--- a/debian/patches/d-bootstrap-disable-git.patch
+++ b/debian/patches/d-bootstrap-disable-git.patch
@@ -31,7 +31,7 @@ Index: rust/src/bootstrap/dist.rs
===================================================================
--- rust.orig/src/bootstrap/dist.rs
+++ rust/src/bootstrap/dist.rs
-@@ -995,7 +995,10 @@ impl Step for PlainSourceTarball {
+@@ -997,7 +997,10 @@ impl Step for PlainSourceTarball {
}
// If we're building from git sources, we need to vendor a complete distribution.
@@ -41,5 +41,5 @@ Index: rust/src/bootstrap/dist.rs
+ // repository, but cargo-vendor should not be installed or run.
+ if false && builder.rust_info().is_managed_git_subrepository() {
// Ensure we have the submodules checked out.
+ builder.update_submodule(Path::new("src/tools/cargo"));
builder.update_submodule(Path::new("src/tools/rust-analyzer"));
-