From 1ed0cc30db5edbf41de2666496b6e4d1882cb54b Mon Sep 17 00:00:00 2001
From: Guillaume Gomez <guillaume1.gomez@gmail.com>
Date: Sat, 29 Nov 2025 18:28:15 +0100
Subject: [PATCH 1/2] Run clippy on cg_gcc in CI

---
 src/ci/docker/host-x86_64/x86_64-gnu-gcc/Dockerfile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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 \

From 0626c7a84b5da0d468d27675f339c816fbf86bc6 Mon Sep 17 00:00:00 2001
From: Guillaume Gomez <guillaume1.gomez@gmail.com>
Date: Sat, 29 Nov 2025 18:53:20 +0100
Subject: [PATCH 2/2] Allow to use cg_gcc path in bootstrap `clippy` command

---
 src/bootstrap/src/core/build_steps/clippy.rs | 2 +-
 src/bootstrap/src/core/builder/tests.rs      | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

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 <host>
         [clippy] rustc 0 <host> -> rustc 1 <host>
+        [check] rustc 0 <host> -> rustc 1 <host>
+        [clippy] rustc 0 <host> -> rustc_codegen_gcc 1 <host>
         ");
     }
 
@@ -2780,6 +2782,8 @@ mod snapshot {
         [build] rustc 0 <host> -> clippy-driver 1 <host>
         [build] rustc 0 <host> -> cargo-clippy 1 <host>
         [clippy] rustc 1 <host> -> rustc 2 <host>
+        [check] rustc 1 <host> -> rustc 2 <host>
+        [clippy] rustc 1 <host> -> rustc_codegen_gcc 2 <host>
         ");
     }