Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/bootstrap/src/core/build_steps/dist.rs
Original file line number Diff line number Diff line change
Expand Up @@ -892,8 +892,8 @@ impl Step for Std {
#[derive(Debug, Clone, Hash, PartialEq, Eq)]
pub struct RustcDev {
/// The compiler that will build rustc which will be shipped in this component.
build_compiler: Compiler,
target: TargetSelection,
pub build_compiler: Compiler,
pub target: TargetSelection,
}

impl RustcDev {
Expand Down
11 changes: 11 additions & 0 deletions src/bootstrap/src/core/build_steps/install.rs
Original file line number Diff line number Diff line change
Expand Up @@ -279,6 +279,17 @@ install!((self, builder, _config),
});
install_sh(builder, "rustc", self.build_compiler, Some(self.target), &tarball);
};
RustcDev, alias = "rustc-dev", Self::should_build(_config), IS_HOST: true, {
if let Some(tarball) = builder.ensure(dist::RustcDev {
build_compiler: self.build_compiler, target: self.target
}) {
install_sh(builder, "rustc-dev", self.build_compiler, Some(self.target), &tarball);
} else {
builder.info(
&format!("skipping Install RustcDev stage{} ({})", self.build_compiler.stage + 1, self.target),
);
}
};
RustcCodegenCranelift, alias = "rustc-codegen-cranelift", Self::should_build(_config), IS_HOST: true, {
if let Some(tarball) = builder.ensure(dist::CraneliftCodegenBackend {
compilers: RustcPrivateCompilers::from_build_compiler(builder, self.build_compiler, self.target),
Expand Down
1 change: 1 addition & 0 deletions src/bootstrap/src/core/builder/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -998,6 +998,7 @@ impl<'a> Builder<'a> {
// binary path, we must install rustc before the tools. Otherwise, the rust-installer will
// install the same binaries twice for each tool, leaving backup files (*.old) as a result.
install::Rustc,
install::RustcDev,
install::Cargo,
install::RustAnalyzer,
install::Rustfmt,
Expand Down
Loading