d-ignore-removed-submodules

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

diff --git a/src/Cargo.toml b/src/Cargo.toml
index dd775280f40a1794f5e029f1330dffa3421b284d..ffc56c30cf2c75767cd7d69128f19efbd5cb3ee6 100644 (file)
--- a/src/Cargo.toml
+++ b/src/Cargo.toml
@@ -15,7 +15,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 fa755864914e2264807fd4c2e5071d683cce2ecd..5b6d3076a0f2717f19e7dd39a428afbfdc1f4a0a 100644 (file)
--- a/src/bootstrap/bootstrap.py
+++ b/src/bootstrap/bootstrap.py
@@ -417,10 +417,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 7830a6d50e88ac26df51c4d47966af0f0a34000c..31f51457cd53b122d443ec15ea3570e3422bfd3e 100644 (file)
--- a/src/bootstrap/lib.rs
+++ b/src/bootstrap/lib.rs
@@ -513,10 +513,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");
         }