Skip to content

Commit ec95e7d

Browse files
authored
Rollup merge of #95901 - jyn514:remove-duplicate-aliases, r=Mark-Simulacrum
Remove duplicate aliases for `check codegen_{cranelift,gcc}` and fix `build codegen_gcc` * Remove duplicate aliases Bootstrap already allows selecting these in `PathSet::has`, which allows any string that matches the end of a full path. I found these by adding `assert!(path.exists())` in `StepDescription::paths`. I think ideally we wouldn't have any aliases that aren't paths, but I've held off on enforcing that here since it may be controversial, I'll open a separate PR. * Add `build compiler/rustc_codegen_gcc` as an alias for `CodegenBackend` These paths (`_cranelift` and `_gcc`) are somewhat misleading, since they actually tell bootstrap to build *all* codegen backends. But this seems like a useful improvement in the meantime. cc ```@bjorn3``` ```@antoyo```
2 parents ae6f75a + 4c14383 commit ec95e7d

File tree

2 files changed

+2
-7
lines changed

2 files changed

+2
-7
lines changed

src/bootstrap/check.rs

+1-6
Original file line numberDiff line numberDiff line change
@@ -243,12 +243,7 @@ impl Step for CodegenBackend {
243243
const DEFAULT: bool = true;
244244

245245
fn should_run(run: ShouldRun<'_>) -> ShouldRun<'_> {
246-
run.paths(&[
247-
"compiler/rustc_codegen_cranelift",
248-
"rustc_codegen_cranelift",
249-
"compiler/rustc_codegen_gcc",
250-
"rustc_codegen_gcc",
251-
])
246+
run.paths(&["compiler/rustc_codegen_cranelift", "compiler/rustc_codegen_gcc"])
252247
}
253248

254249
fn make_run(run: RunConfig<'_>) {

src/bootstrap/compile.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -795,7 +795,7 @@ impl Step for CodegenBackend {
795795
const DEFAULT: bool = true;
796796

797797
fn should_run(run: ShouldRun<'_>) -> ShouldRun<'_> {
798-
run.path("compiler/rustc_codegen_cranelift")
798+
run.paths(&["compiler/rustc_codegen_cranelift", "compiler/rustc_codegen_gcc"])
799799
}
800800

801801
fn make_run(run: RunConfig<'_>) {

0 commit comments

Comments
 (0)