From: Matthijs van Otterdijk <matthijs@wirevirt.net>
Date: Sat, 18 May 2019 19:18:25 +0000 (+0100)
Subject: Don't check for cargo-vendor when building from (Debian's) git
X-Git-Tag: archive/raspbian/1.33.0+dfsg1-2+rpi1^2~11
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=e584978837258879fefbcac9c7a449215aa1199f;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 0c6e213110..40d1f2f4c8 100644
--- a/src/bootstrap/dist.rs
+++ b/src/bootstrap/dist.rs
@@ -961,7 +961,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);