itsscb/rust
1
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-10-02 18:27:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup the last few dist steps

Browse Source
This commit is contained in:
Jakub Beránek 2025-08-15 20:31:13 +02:00
parent 699e5fe933
commit e8af2365c0
No known key found for this signature in database
GPG Key ID: 909CD0D26483516B
2 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/bootstrap/src/core/build_steps/dist.rs
View File

@ -2653,12 +2653,12 @@ impl Step for Bootstrap {
/// Should not be considered stable by end users.
#[derive(Clone, Debug, Eq, Hash, PartialEq)]
pub struct BuildManifest {
pub target: TargetSelection,
target: TargetSelection,
}
impl Step for BuildManifest {
type Output = GeneratedTarball;
const DEFAULT: bool = false;
const IS_HOST: bool = true;
fn should_run(run: ShouldRun<'_>) -> ShouldRun<'_> {
@ -2676,16 +2676,20 @@ impl Step for BuildManifest {
tarball.add_file(&build_manifest, "bin", FileType::Executable);
tarball.generate()
}
fn metadata(&self) -> Option<StepMetadata> {
Some(StepMetadata::dist("build-manifest", self.target))
}
}
/// Tarball containing artifacts necessary to reproduce the build of rustc.
///
/// Currently this is the PGO profile data.
/// Currently this is the PGO (and possibly BOLT) profile data.
///
/// Should not be considered stable by end users.
#[derive(Clone, Debug, Eq, Hash, PartialEq)]
pub struct ReproducibleArtifacts {
pub target: TargetSelection,
target: TargetSelection,
}
impl Step for ReproducibleArtifacts {
@ -2718,6 +2722,10 @@ impl Step for ReproducibleArtifacts {
}
if added_anything { Some(tarball.generate()) } else { None }
}
fn metadata(&self) -> Option<StepMetadata> {
Some(StepMetadata::dist("reproducible-artifacts", self.target))
}
}
/// Tarball containing a prebuilt version of the libgccjit library,
@ -2725,7 +2733,7 @@ impl Step for ReproducibleArtifacts {
/// backend needing a prebuilt libLLVM).
#[derive(Clone, Debug, Eq, Hash, PartialEq)]
pub struct Gcc {
pub target: TargetSelection,
target: TargetSelection,
}
impl Step for Gcc {
@ -2745,4 +2753,8 @@ impl Step for Gcc {
tarball.add_file(&output.libgccjit, "lib", FileType::NativeLibrary);
tarball.generate()
}
fn metadata(&self) -> Option<StepMetadata> {
Some(StepMetadata::dist("gcc", self.target))
}
}

9
src/bootstrap/src/core/builder/tests.rs
View File

@ -1136,6 +1136,7 @@ mod snapshot {
[dist] rustc 1 <host> -> std 1 <host>
[dist] rustc 1 <host> -> rustc-dev 2 <host>
[dist] src <>
[dist] reproducible-artifacts <host>
"
);
}
@ -1214,6 +1215,7 @@ mod snapshot {
[build] rustc 1 <host> -> cargo-miri 2 <host>
[dist] rustc 1 <host> -> miri 2 <host>
[dist] rustc 1 <host> -> extended 2 <host>
[dist] reproducible-artifacts <host>
");
}
@ -1287,6 +1289,7 @@ mod snapshot {
[dist] rustc 2 <host> -> std 2 <target1>
[dist] rustc 1 <host> -> rustc-dev 2 <host>
[dist] src <>
[dist] reproducible-artifacts <host>
"
);
}
@ -1347,6 +1350,8 @@ mod snapshot {
[dist] rustc 1 <host> -> rustc-dev 2 <host>
[dist] rustc 1 <host> -> rustc-dev 2 <target1>
[dist] src <>
[dist] reproducible-artifacts <host>
[dist] reproducible-artifacts <target1>
"
);
}
@ -1428,6 +1433,8 @@ mod snapshot {
[dist] rustc 1 <host> -> rustc-dev 2 <host>
[dist] rustc 1 <host> -> rustc-dev 2 <target1>
[dist] src <>
[dist] reproducible-artifacts <host>
[dist] reproducible-artifacts <target1>
"
);
}
@ -1551,6 +1558,7 @@ mod snapshot {
[build] rustc 1 <host> -> LlvmBitcodeLinker 2 <target1>
[doc] rustc 2 <target1> -> std 2 <target1> crates=[]
[dist] rustc 1 <host> -> extended 2 <target1>
[dist] reproducible-artifacts <target1>
");
}
@ -1605,6 +1613,7 @@ mod snapshot {
[dist] rustc 1 <host> -> std 1 <host>
[dist] rustc 1 <host> -> rustc-dev 2 <host>
[dist] src <>
[dist] reproducible-artifacts <host>
");
}