From: Rust Maintainers <pkg-rust-maintainers@lists.alioth.debian.org>
Date: Mon, 6 Nov 2017 09:03:32 +0000 (+0000)
Subject: d-disable-cargo-vendor
X-Git-Tag: archive/raspbian/1.21.0+dfsg1-3+rpi1^2~8
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=fdb256afbe75454d4c2986d23b1d3f6f6052c85c;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 65a59d78d7..3647e4c281 100644
--- a/src/bootstrap/dist.rs
+++ b/src/bootstrap/dist.rs
@@ -839,7 +839,10 @@ impl Step for PlainSourceTarball {
         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.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 && build.rust_info.is_git() {
             // Get cargo-vendor installed, if it isn't already.
             let mut has_cargo_vendor = false;
             let mut cmd = Command::new(&build.initial_cargo);