Skip to content
This repository was archived by the owner on May 28, 2025. It is now read-only.

Commit 48470b7

Browse files
committed
Auto merge of rust-lang#112049 - Kobzol:pgo-omit-benchmarks, r=<try>
[do not merge] CI experiments Various CI experiments for try/dist builds. r? `@ghost`
2 parents a4166da + eec769f commit 48470b7

File tree

3 files changed

+19
-1
lines changed

3 files changed

+19
-1
lines changed

src/bootstrap/src/core/build_steps/compile.rs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1280,6 +1280,11 @@ pub fn rustc_cargo(
12801280
));
12811281
}
12821282

1283+
if compiler.stage != 0 {
1284+
cargo.rustflag("-Cpanic=abort");
1285+
cargo.rustflag("-Cforce-unwind-tables=yes");
1286+
}
1287+
12831288
rustc_cargo_env(builder, cargo, target, compiler.stage);
12841289
}
12851290

src/bootstrap/src/core/build_steps/tool.rs

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -239,6 +239,19 @@ pub fn prepare_tool_cargo(
239239
}
240240
}
241241

242+
if compiler.stage != 0 {
243+
if path.ends_with("rls")
244+
|| path.ends_with("clippy")
245+
|| path.ends_with("miri")
246+
|| path.ends_with("rustfmt")
247+
|| path.ends_with("rustdoc")
248+
|| path.ends_with("rustdoc-tool")
249+
{
250+
cargo.rustflag("-Cpanic=abort");
251+
cargo.rustflag("-Cforce-unwind-tables=yes");
252+
}
253+
}
254+
242255
// clippy tests need to know about the stage sysroot. Set them consistently while building to
243256
// avoid rebuilding when running tests.
244257
cargo.env("SYSROOT", builder.sysroot(compiler));

src/ci/github-actions/jobs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ pr:
121121
try:
122122
- name: dist-x86_64-linux
123123
env:
124-
CODEGEN_BACKENDS: llvm,cranelift
124+
CODEGEN_BACKENDS: llvm
125125
<<: *job-linux-16c
126126

127127
# Main CI jobs that have to be green to merge a commit into master

0 commit comments

Comments
 (0)