From: Matthijs van Otterdijk <matthijs@wirevirt.net>
Date: Thu, 14 Jul 2022 11:17:38 +0000 (+0200)
Subject: Don't check for cargo-vendor when building from (Debian's) git
X-Git-Tag: archive/raspbian/1.66.0+dfsg1-1+rpi1^2~20
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=71e687caecda6688a477466631034c02aac31d26;p=rustc.git

Don't check for cargo-vendor when building from (Debian's) git

Forwarded: not-needed

Forwarded: not-needed

Gbp-Pq: Name d-bootstrap-disable-git.patch
---

diff --git a/src/bootstrap/channel.rs b/src/bootstrap/channel.rs
index 258352a21a..8e14f9f5da 100644
--- a/src/bootstrap/channel.rs
+++ b/src/bootstrap/channel.rs
@@ -33,6 +33,12 @@ pub struct Info {
 
 impl GitInfo {
     pub fn new(ignore_git: bool, dir: &Path) -> GitInfo {
+        //
+        // Debian: returning early because the Debian package is also in a git
+        //         repository, but we don't want to parse gitinfo. This is
+        //         needed for the bootstrap tests to work which running for
+        //         Debian git.
+        return GitInfo::Absent;
         // See if this even begins to look like a git dir
         if !dir.join(".git").exists() {
             match read_commit_info_file(dir) {
diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs
index 12585e80e6..df8962446f 100644
--- a/src/bootstrap/dist.rs
+++ b/src/bootstrap/dist.rs
@@ -925,7 +925,10 @@ impl Step for PlainSourceTarball {
         }
 
         // If we're building from git sources, we need to vendor a complete distribution.
-        if builder.rust_info.is_managed_git_subrepository() {
+        //
+        // Debian: short-circuited because the Debian package is also in a git
+        //         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/rust-analyzer"));