Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add support for targets without unwinding in mir-opt, and improve --bless for it #112418

Merged
merged 13 commits into from
Jun 14, 2023
Merged

Add support for targets without unwinding in mir-opt, and improve --bless for it #112418

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
1b5143a
stop using a macro for the mir-opt test suite
pietroalbini Jun 6, 2023
68d458b
allow mutating the c compilers detected by bootstrap
pietroalbini Jun 6, 2023
c6707dc
return dummy cc and friends during dry runs
pietroalbini Jun 7, 2023
1c26f1b
split finding the cc for a single target into a separate fn
pietroalbini Jun 6, 2023
9ec370d
bless both 32bit and 64bit variants of mir-opt when available
pietroalbini Jun 7, 2023
9de3c29
add support for blessing panic=abort mir-opt tests
pietroalbini Jun 7, 2023
6fd0d1b
make sure the standard library compiles properly with synthetic targets
pietroalbini Jun 8, 2023
a4e8904
add way to split mir-opt into panic=abort and panic=unwind
pietroalbini Jun 7, 2023
070cc83
properly mark tests that require panic=abort
pietroalbini Jun 8, 2023
4668123
bless mir-opt
pietroalbini Jun 8, 2023
86aa326
fmt
pietroalbini Jun 13, 2023
47b6732
add another check for empty `cc`s
pietroalbini Jun 13, 2023
f67809a
yet another dry run fix
pietroalbini Jun 14, 2023
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
Prev Previous commit
Next Next commit
make sure the standard library compiles properly with synthetic targets 
It might happen that a synthetic target name does not match one of the
hardcoded ones in std's build script, causing std to fail to build. This
commit changes the std build script avoid including the restricted-std
feature unconditionally when a synthetic target is being built.
  • Loading branch information
@pietroalbini
pietroalbini committed Jun 12, 2023
commit 6fd0d1ba149a7049f2acb78ed4a93570ce36e3e4
2 changes: 2 additions & 0 deletions library/std/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@ fn main() {
|| target.contains("nintendo-3ds")
|| target.contains("vita")
|| target.contains("nto")
// See src/bootstrap/synthetic_targets.rs
|| env::var("RUSTC_BOOTSTRAP_SYNTHETIC_TARGET").is_ok()
{
// These platforms don't have any special requirements.
} else {
Expand Down
5 changes: 5 additions & 0 deletions src/bootstrap/compile.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,11 @@ impl Step for Std {
cargo.arg("-p").arg(krate);
}

// See src/bootstrap/synthetic_targets.rs
if target.is_synthetic() {
cargo.env("RUSTC_BOOTSTRAP_SYNTHETIC_TARGET", "1");
}

let _guard = builder.msg(
Kind::Build,
compiler.stage,
Expand Down