From 6dff161a87205eaef0912ea7dfa72514e28c8f5b Mon Sep 17 00:00:00 2001 From: Debian Rust Maintainers Date: Sat, 2 Oct 2021 01:07:59 +0100 Subject: [PATCH] d-0000-ignore-removed-submodules Description: remove upstream parts that are not needed for the Debian build, in order to both reduce the orig tarball and the vendored crates within. Forwarded: not-needed Gbp-Pq: Topic prune Gbp-Pq: Name d-0000-ignore-removed-submodules.patch --- Cargo.toml | 5 ----- src/bootstrap/bootstrap.py | 4 ---- src/bootstrap/src/core/build_steps/vendor.rs | 5 ----- src/bootstrap/src/core/builder/cargo.rs | 5 +---- src/bootstrap/src/core/builder/mod.rs | 20 -------------------- src/build_helper/src/util.rs | 2 ++ 6 files changed, 3 insertions(+), 38 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 67c7a9d67e..e273c4b71d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -9,7 +9,6 @@ members = [ "src/rustc-std-workspace/rustc-std-workspace-std", "src/rustdoc-json-types", "src/tools/build-manifest", - "src/tools/bump-stage0", "src/tools/cargotest", "src/tools/clippy", "src/tools/clippy/clippy_dev", @@ -26,12 +25,8 @@ members = [ "src/tools/lint-docs", "src/tools/lld-wrapper", "src/tools/llvm-bitcode-linker", - "src/tools/miri", - "src/tools/miri/cargo-miri", "src/tools/miropt-test-tools", "src/tools/opt-dist", - "src/tools/remote-test-client", - "src/tools/remote-test-server", "src/tools/replace-version-placeholder", "src/tools/run-make-support", "src/tools/rust-installer", diff --git a/src/bootstrap/bootstrap.py b/src/bootstrap/bootstrap.py index 2ece53eb0c..29763d23a9 100644 --- a/src/bootstrap/bootstrap.py +++ b/src/bootstrap/bootstrap.py @@ -1150,10 +1150,6 @@ class RustBuild(object): if "BOOTSTRAP_TRACING" in env: args.append("--features=tracing") - if self.use_locked_deps: - args.append("--locked") - if self.use_vendored_sources: - args.append("--frozen") if self.get_toml("metrics", "build"): args.append("--features") args.append("build-metrics") diff --git a/src/bootstrap/src/core/build_steps/vendor.rs b/src/bootstrap/src/core/build_steps/vendor.rs index 0e9d4e7e32..8fb17929ba 100644 --- a/src/bootstrap/src/core/build_steps/vendor.rs +++ b/src/bootstrap/src/core/build_steps/vendor.rs @@ -21,14 +21,9 @@ pub fn default_paths_to_vendor(builder: &Builder<'_>) -> Vec<(PathBuf, Vec<&'sta ("src/tools/cargo/Cargo.toml", vec!["src/tools/cargo"]), ("src/tools/clippy/clippy_test_deps/Cargo.toml", vec![]), ("src/tools/rust-analyzer/Cargo.toml", vec![]), - ("compiler/rustc_codegen_cranelift/Cargo.toml", vec![]), - ("compiler/rustc_codegen_gcc/Cargo.toml", vec![]), ("library/Cargo.toml", vec![]), ("src/bootstrap/Cargo.toml", vec![]), ("src/tools/rustbook/Cargo.toml", SUBMODULES_FOR_RUSTBOOK.into()), - ("src/tools/rustc-perf/Cargo.toml", vec!["src/tools/rustc-perf"]), - ("src/tools/opt-dist/Cargo.toml", vec![]), - ("src/doc/book/packages/trpl/Cargo.toml", vec![]), ] .into_iter() .map(|(path, submodules)| (builder.src.join(path), submodules)) diff --git a/src/bootstrap/src/core/builder/cargo.rs b/src/bootstrap/src/core/builder/cargo.rs index b7d2b72363..c018aedb08 100644 --- a/src/bootstrap/src/core/builder/cargo.rs +++ b/src/bootstrap/src/core/builder/cargo.rs @@ -1286,10 +1286,7 @@ impl Builder<'_> { } } - if self.config.locked_deps { - cargo.arg("--locked"); - } - if self.config.vendor || self.is_sudo { + if self.is_sudo { cargo.arg("--frozen"); } diff --git a/src/bootstrap/src/core/builder/mod.rs b/src/bootstrap/src/core/builder/mod.rs index b212373839..f8050b9f31 100644 --- a/src/bootstrap/src/core/builder/mod.rs +++ b/src/bootstrap/src/core/builder/mod.rs @@ -987,8 +987,6 @@ impl<'a> Builder<'a> { tool::Linkchecker, tool::CargoTest, tool::Compiletest, - tool::RemoteTestServer, - tool::RemoteTestClient, tool::RustInstaller, tool::FeaturesStatusDump, tool::Cargo, @@ -997,17 +995,8 @@ impl<'a> Builder<'a> { tool::Rustdoc, tool::Clippy, tool::CargoClippy, - llvm::Llvm, - gcc::Gcc, - llvm::Sanitizers, tool::Rustfmt, tool::Cargofmt, - tool::Miri, - tool::CargoMiri, - llvm::Lld, - llvm::Enzyme, - llvm::CrtBeginEnd, - tool::RustdocGUITest, tool::OptimizedDist, tool::CoverageDump, tool::LlvmBitcodeLinker, @@ -1050,9 +1039,6 @@ impl<'a> Builder<'a> { check::CraneliftCodegenBackend, check::GccCodegenBackend, check::Clippy, - check::Miri, - check::CargoMiri, - check::MiroptTestTools, check::Rustfmt, check::RustAnalyzer, check::TestFloatParse, @@ -1113,8 +1099,6 @@ impl<'a> Builder<'a> { test::EmbeddedBook, test::EditionGuide, test::Rustfmt, - test::Miri, - test::CargoMiri, test::Clippy, test::CompiletestTest, test::CrateRunMakeSupport, @@ -1153,7 +1137,6 @@ impl<'a> Builder<'a> { doc::CargoBook, doc::Clippy, doc::ClippyBook, - doc::Miri, doc::EmbeddedBook, doc::EditionGuide, doc::StyleGuide, @@ -1179,7 +1162,6 @@ impl<'a> Builder<'a> { dist::RustAnalyzer, dist::Rustfmt, dist::Clippy, - dist::Miri, dist::LlvmTools, dist::LlvmBitcodeLinker, dist::RustDev, @@ -1206,7 +1188,6 @@ impl<'a> Builder<'a> { install::RustAnalyzer, install::Rustfmt, install::Clippy, - install::Miri, install::LlvmTools, install::Src, ), @@ -1214,7 +1195,6 @@ impl<'a> Builder<'a> { run::BuildManifest, run::BumpStage0, run::ReplaceVersionPlaceholder, - run::Miri, run::CollectLicenseMetadata, run::GenerateCopyright, run::GenerateWindowsSys, diff --git a/src/build_helper/src/util.rs b/src/build_helper/src/util.rs index 1bdbb7515e..861cd9c64d 100644 --- a/src/build_helper/src/util.rs +++ b/src/build_helper/src/util.rs @@ -61,6 +61,8 @@ pub fn try_run(cmd: &mut Command, print_cmd_on_fail: bool) -> Result<(), ()> { /// Returns the submodule paths from the `.gitmodules` file in the given directory. pub fn parse_gitmodules(target_dir: &Path) -> Vec { + return vec![]; + let gitmodules = target_dir.join(".gitmodules"); assert!(gitmodules.exists(), "'{}' file is missing.", gitmodules.display()); -- 2.30.2