From: Rust Maintainers <pkg-rust-maintainers@lists.alioth.debian.org>
Date: Sun, 15 Oct 2017 19:31:03 +0000 (+0100)
Subject: d-disable-cargo-vendor
X-Git-Tag: archive/raspbian/1.19.0+dfsg3-4+rpi1~9
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=13662462d156e39771f598896743e56cce33c9be;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 6d696dfe5b..8599562869 100644
--- a/src/bootstrap/dist.rs
+++ b/src/bootstrap/dist.rs
@@ -634,7 +634,10 @@ pub fn plain_source_tarball(build: &Build) {
     write_file(&plain_dst_src.join("version"), build.rust_version().as_bytes());
 
     // 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);