From 71ac3bb8738d642a6d4aa284ae72c6b3544e9f10 Mon Sep 17 00:00:00 2001 From: Rust Maintainers Date: Sun, 15 Oct 2017 22:30:35 +0100 Subject: [PATCH] d-ignore-removed-submodules Gbp-Pq: Name d-ignore-removed-submodules.patch --- src/Cargo.toml | 1 - src/bootstrap/bootstrap.py | 4 ---- src/bootstrap/lib.rs | 5 +---- 3 files changed, 1 insertion(+), 9 deletions(-) diff --git a/src/Cargo.toml b/src/Cargo.toml index dd775280f4..ffc56c30cf 100644 --- 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 fa75586491..5b6d3076a0 100644 --- 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 7830a6d50e..31f51457cd 100644 --- 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"); } -- 2.30.2