Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/bootstrap/src/core/build_steps/clippy.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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<'_>) {
Expand Down
4 changes: 4 additions & 0 deletions src/bootstrap/src/core/builder/tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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>
");
}

Expand All @@ -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>
");
}

Expand Down
3 changes: 2 additions & 1 deletion src/ci/docker/host-x86_64/x86_64-gnu-gcc/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 && \
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No it doesn't. I can add that as a follow-up in the clippy rule.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It would be nice since the above issue would only happens without the master feature.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

../x.py \
--stage 2 \
test tests \
--test-codegen-backend gcc \
Expand Down
Loading