From: Rust Maintainers <pkg-rust-maintainers@lists.alioth.debian.org>
Date: Fri, 19 Jan 2018 10:49:31 +0000 (+0000)
Subject: d-disable-cargo-vendor
X-Git-Tag: archive/raspbian/1.23.0+dfsg1-1+rpi1^2~7
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=ffa0bfec6cf1c27d49d795cb3ba6de761882d54e;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 9f7e3de9dc..4e7a57ff65 100644
--- a/src/bootstrap/dist.rs
+++ b/src/bootstrap/dist.rs
@@ -856,7 +856,10 @@ impl Step for PlainSourceTarball {
         }
 
         // 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);