From: Matthijs van Otterdijk <matthijs@wirevirt.net>
Date: Tue, 29 Mar 2022 11:23:46 +0000 (+0100)
Subject: Don't check for cargo-vendor when building from (Debian's) git
X-Git-Tag: archive/raspbian/1.58.1+dfsg1-1+rpi1^2~14
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=12690a57adff5ffa9cc375d070ca1f86d2773686;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 6478578c3c..774d71d6cc 100644
--- a/src/bootstrap/channel.rs
+++ b/src/bootstrap/channel.rs
@@ -30,7 +30,11 @@ pub struct Info {
 impl GitInfo {
     pub fn new(ignore_git: bool, dir: &Path) -> GitInfo {
         // See if this even begins to look like a git dir
-        if !dir.join(".git").exists() {
+        //
+        // Debian: force-enabling this block 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.
+        if true || !dir.join(".git").exists() {
             return GitInfo::Absent;
         }
 
diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs
index 09ea84a083..fbecef5920 100644
--- a/src/bootstrap/dist.rs
+++ b/src/bootstrap/dist.rs
@@ -916,7 +916,10 @@ impl Step for PlainSourceTarball {
         }
 
         // If we're building from git sources, we need to vendor a complete distribution.
-        if builder.rust_info.is_git() {
+        //
+        // Debian: disabling this block 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_git() {
             // Vendor all Cargo dependencies
             let mut cmd = Command::new(&builder.initial_cargo);
             cmd.arg("vendor")