Skip to content
Merged
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
6 changes: 3 additions & 3 deletions compiler/rustc_codegen_gcc/src/builder.rs
Original file line number Diff line number Diff line change
Expand Up @@ -500,11 +500,11 @@ impl<'gcc, 'tcx> BackendTypes for Builder<'_, 'gcc, 'tcx> {
}

fn set_rvalue_location<'a, 'gcc, 'tcx>(
bx: &mut Builder<'a, 'gcc, 'tcx>,
_bx: &mut Builder<'a, 'gcc, 'tcx>,
rvalue: RValue<'gcc>,
) -> RValue<'gcc> {
if let Some(location) = bx.location {
#[cfg(feature = "master")]
#[cfg(feature = "master")]
if let Some(location) = _bx.location {
rvalue.set_location(location);
}
rvalue
Expand Down
23 changes: 16 additions & 7 deletions src/bootstrap/src/core/build_steps/clippy.rs
Original file line number Diff line number Diff line change
Expand Up @@ -379,15 +379,24 @@ impl Step for CodegenGcc {
let stamp = BuildStamp::new(&builder.cargo_out(build_compiler, Mode::Codegen, target))
.with_prefix("rustc_codegen_gcc-check");

run_cargo(
let args = lint_args(builder, &self.config, &[]);
run_cargo(builder, cargo, args.clone(), &stamp, vec![], true, false);

// Same but we disable the features enabled by default.
let mut cargo = prepare_tool_cargo(
builder,
cargo,
lint_args(builder, &self.config, &[]),
&stamp,
vec![],
true,
false,
build_compiler,
Mode::Codegen,
target,
Kind::Clippy,
"compiler/rustc_codegen_gcc",
SourceType::InTree,
&[],
);
self.build_compiler.configure_cargo(&mut cargo);
println!("Now running clippy on `rustc_codegen_gcc` with `--no-default-features`");
cargo.arg("--no-default-features");
run_cargo(builder, cargo, args, &stamp, vec![], true, false);
}

fn metadata(&self) -> Option<StepMetadata> {
Expand Down
Loading