diff --git a/src/bootstrap/src/core/build_steps/clippy.rs b/src/bootstrap/src/core/build_steps/clippy.rs index d8b74b43cfab8..63a5e52d1e4af 100644 --- a/src/bootstrap/src/core/build_steps/clippy.rs +++ b/src/bootstrap/src/core/build_steps/clippy.rs @@ -343,7 +343,7 @@ impl Step for CodegenGcc { type Output = (); fn should_run(run: ShouldRun<'_>) -> ShouldRun<'_> { - run.alias("rustc_codegen_gcc") + run.alias("rustc_codegen_gcc").path("compiler/rustc_codegen_gcc") } fn make_run(run: RunConfig<'_>) { diff --git a/src/bootstrap/src/core/builder/tests.rs b/src/bootstrap/src/core/builder/tests.rs index b8ba1b4c2c340..208f2b543bccb 100644 --- a/src/bootstrap/src/core/builder/tests.rs +++ b/src/bootstrap/src/core/builder/tests.rs @@ -2763,6 +2763,8 @@ mod snapshot { .render_steps(), @r" [build] llvm [clippy] rustc 0 -> rustc 1 + [check] rustc 0 -> rustc 1 + [clippy] rustc 0 -> rustc_codegen_gcc 1 "); } @@ -2780,6 +2782,8 @@ mod snapshot { [build] rustc 0 -> clippy-driver 1 [build] rustc 0 -> cargo-clippy 1 [clippy] rustc 1 -> rustc 2 + [check] rustc 1 -> rustc 2 + [clippy] rustc 1 -> rustc_codegen_gcc 2 "); } diff --git a/src/ci/docker/host-x86_64/x86_64-gnu-gcc/Dockerfile b/src/ci/docker/host-x86_64/x86_64-gnu-gcc/Dockerfile index 0fd14ae232d73..aa893f0baf3f2 100644 --- a/src/ci/docker/host-x86_64/x86_64-gnu-gcc/Dockerfile +++ b/src/ci/docker/host-x86_64/x86_64-gnu-gcc/Dockerfile @@ -39,7 +39,8 @@ ENV RUST_CONFIGURE_ARGS \ --enable-compiler-docs \ --set llvm.libzstd=true \ --set 'rust.codegen-backends=[\"llvm\",\"gcc\"]' -ENV SCRIPT python3 ../x.py \ +ENV SCRIPT python3 ../x.py --stage 2 clippy compiler/rustc_codegen_gcc && \ + ../x.py \ --stage 2 \ test tests \ --test-codegen-backend gcc \