From: Rust Maintainers <pkg-rust-maintainers@lists.alioth.debian.org>
Date: Tue, 25 Jul 2017 21:19:47 +0000 (+0100)
Subject: d-disable-cargo-vendor
X-Git-Tag: archive/raspbian/1.19.0+dfsg3-4+rpi1~1^2~8
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=1233cd5c1af1dd07e71f50532f31d9eb269d5e24;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 4328c4e3f1..a39f5cb164 100644
--- a/src/bootstrap/dist.rs
+++ b/src/bootstrap/dist.rs
@@ -434,7 +434,10 @@ pub fn rust_src(build: &Build) {
     }
 
     // If we're building from git sources, we need to vendor a complete distribution.
-    if build.src_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 && build.src_is_git {
         // Get cargo-vendor installed, if it isn't already.
         let mut has_cargo_vendor = false;
         let mut cmd = Command::new(&build.cargo);