From: Rust Maintainers <pkg-rust-maintainers@lists.alioth.debian.org>
Date: Mon, 17 Jul 2017 11:41:59 +0000 (+0100)
Subject: d-disable-cargo-vendor
X-Git-Tag: archive/raspbian/1.17.0+dfsg2-8+rpi1~1^2~9
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=b93adff15ea60366254e33a613a7c24f18a17bcb;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 9119b00d6d..dcce19aa64 100644
--- a/src/bootstrap/dist.rs
+++ b/src/bootstrap/dist.rs
@@ -438,7 +438,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);