From: Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
Date: Sat, 13 Jul 2019 17:30:35 +0000 (+0100)
Subject: d-disable-cargo-vendor
X-Git-Tag: archive/raspbian/1.35.0+dfsg1-1+rpi1^2~10
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=9db90f41812be2b01ee7ad03925f1c69f5b08843;p=rustc.git

d-disable-cargo-vendor


Gbp-Pq: Name d-disable-cargo-vendor.patch
---

diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs
index 61a7705bd6..a7c1392cb9 100644
--- a/src/bootstrap/dist.rs
+++ b/src/bootstrap/dist.rs
@@ -996,7 +996,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);