From: Rust Maintainers <pkg-rust-maintainers@lists.alioth.debian.org>
Date: Sun, 15 Oct 2017 19:31:03 +0000 (+0100)
Subject: d-ignore-removed-submodules
X-Git-Tag: archive/raspbian/1.19.0+dfsg3-4+rpi1~2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=ce00f1ea625e6527408830443334c25d87d1ff49;p=rustc.git

d-ignore-removed-submodules


Gbp-Pq: Name d-ignore-removed-submodules.patch
---

diff --git a/src/Cargo.toml b/src/Cargo.toml
index 015d658d22..8653c83970 100644
--- a/src/Cargo.toml
+++ b/src/Cargo.toml
@@ -14,7 +14,6 @@ members = [
   "tools/remote-test-client",
   "tools/remote-test-server",
   "tools/rust-installer",
-  "tools/cargo",
 ]
 
 # Curiously, compiletest will segfault if compiled with opt-level=3 on 64-bit
diff --git a/src/bootstrap/bootstrap.py b/src/bootstrap/bootstrap.py
index 646f37ab10..25cac6a095 100644
--- a/src/bootstrap/bootstrap.py
+++ b/src/bootstrap/bootstrap.py
@@ -407,10 +407,6 @@ class RustBuild(object):
             args.append("--verbose")
             if self.verbose > 1:
                 args.append("--verbose")
-        if self.use_locked_deps:
-            args.append("--locked")
-        if self.use_vendored_sources:
-            args.append("--frozen")
         run(args, env=env, verbose=self.verbose)
 
     def build_triple(self):
diff --git a/src/bootstrap/lib.rs b/src/bootstrap/lib.rs
index b16902ae5c..f869fff651 100644
--- a/src/bootstrap/lib.rs
+++ b/src/bootstrap/lib.rs
@@ -506,10 +506,7 @@ impl Build {
         if self.config.rust_optimize && cmd != "bench" {
             cargo.arg("--release");
         }
-        if self.config.locked_deps {
-            cargo.arg("--locked");
-        }
-        if self.config.vendor || self.is_sudo {
+        if self.is_sudo {
             cargo.arg("--frozen");
         }