From: Matthijs van Otterdijk <matthijs@wirevirt.net>
Date: Thu, 30 May 2019 04:52:37 +0000 (+0100)
Subject: Don't check for cargo-vendor when building from (Debian's) git
X-Git-Tag: archive/raspbian/1.34.2+dfsg1-1+rpi1^2~11
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=bc26e9b547b6851071529f6fc725e1eb44af2fb8;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-disable-cargo-vendor.patch
---

diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs
index 2dae3f9135..e99c5628d8 100644
--- a/src/bootstrap/dist.rs
+++ b/src/bootstrap/dist.rs
@@ -992,7 +992,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() {
             // Get cargo-vendor installed, if it isn't already.
             let mut has_cargo_vendor = false;
             let mut cmd = Command::new(&builder.initial_cargo);