From: Debian Rust Maintainers Date: Sat, 2 Oct 2021 01:07:59 +0100 Subject: 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 --- 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 67c7a9d..e273c4b 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 40e0836..0ce28a1 100644 --- a/src/bootstrap/bootstrap.py +++ b/src/bootstrap/bootstrap.py @@ -1138,10 +1138,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 9050f40..7b4c69b 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 6b3236e..10af1ee 100644 --- a/src/bootstrap/src/core/builder/cargo.rs +++ b/src/bootstrap/src/core/builder/cargo.rs @@ -1247,10 +1247,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 deee041..fb03b4f 100644 --- a/src/bootstrap/src/core/builder/mod.rs +++ b/src/bootstrap/src/core/builder/mod.rs @@ -960,8 +960,6 @@ impl<'a> Builder<'a> { tool::Linkchecker, tool::CargoTest, tool::Compiletest, - tool::RemoteTestServer, - tool::RemoteTestClient, tool::RustInstaller, tool::FeaturesStatusDump, tool::Cargo, @@ -970,17 +968,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, @@ -1022,9 +1011,6 @@ impl<'a> Builder<'a> { check::Rustdoc, check::CodegenBackend, check::Clippy, - check::Miri, - check::CargoMiri, - check::MiroptTestTools, check::Rustfmt, check::RustAnalyzer, check::TestFloatParse, @@ -1084,8 +1070,6 @@ impl<'a> Builder<'a> { test::EmbeddedBook, test::EditionGuide, test::Rustfmt, - test::Miri, - test::CargoMiri, test::Clippy, test::CompiletestTest, test::CrateRunMakeSupport, @@ -1124,7 +1108,6 @@ impl<'a> Builder<'a> { doc::CargoBook, doc::Clippy, doc::ClippyBook, - doc::Miri, doc::EmbeddedBook, doc::EditionGuide, doc::StyleGuide, @@ -1150,7 +1133,6 @@ impl<'a> Builder<'a> { dist::RustAnalyzer, dist::Rustfmt, dist::Clippy, - dist::Miri, dist::LlvmTools, dist::LlvmBitcodeLinker, dist::RustDev, @@ -1177,7 +1159,6 @@ impl<'a> Builder<'a> { install::RustAnalyzer, install::Rustfmt, install::Clippy, - install::Miri, install::LlvmTools, install::Src, ), @@ -1185,7 +1166,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 a8355f7..6b9e277 100644 --- a/src/build_helper/src/util.rs +++ b/src/build_helper/src/util.rs @@ -50,6 +50,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());