mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rollup merge of #95901 - jyn514:remove-duplicate-aliases, r=Mark-Simulacrum

Browse Source 
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```
This commit is contained in:
Dylan DPC 2022-04-11 20:00:45 +02:00 committed by GitHub
commit ec95e7d2a5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/bootstrap/check.rs
View File

@ -243,12 +243,7 @@ impl Step for CodegenBackend {
const DEFAULT: bool = true; const DEFAULT: bool = true;
fn should_run(run: ShouldRun<'_>) -> ShouldRun<'_> { fn should_run(run: ShouldRun<'_>) -> ShouldRun<'_> {
run.paths(&[ run.paths(&["compiler/rustc_codegen_cranelift", "compiler/rustc_codegen_gcc"])
"compiler/rustc_codegen_cranelift",
"rustc_codegen_cranelift",
"compiler/rustc_codegen_gcc",
"rustc_codegen_gcc",
])
} }
fn make_run(run: RunConfig<'_>) { fn make_run(run: RunConfig<'_>) {

2
src/bootstrap/compile.rs
View File

@ -795,7 +795,7 @@ impl Step for CodegenBackend {
const DEFAULT: bool = true; const DEFAULT: bool = true;
fn should_run(run: ShouldRun<'_>) -> ShouldRun<'_> { fn should_run(run: ShouldRun<'_>) -> ShouldRun<'_> {
run.path("compiler/rustc_codegen_cranelift") run.paths(&["compiler/rustc_codegen_cranelift", "compiler/rustc_codegen_gcc"])
} }
fn make_run(run: RunConfig<'_>) { fn make_run(run: RunConfig<'_>) {