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.

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

cargo-miri: never invoke rustc #1406

Merged
merged 3 commits into from
May 10, 2020
Merged

Conversation

RalfJung
Copy link
Member

@RalfJung RalfJung commented May 10, 2020

Always go through 'MIRI_BE_RUSTC=1 miri' instead. This is based on @oli-obk's great idea to add a way to make Miri behave like rustc, which already helped us in #1405. Now it means in cargo-miri we run all crates through the same binary, and use the env var to determine if we compile or interpret them. This makes sure the compiler is consistent.

The rustc binary of the current toolchain is now not used at all, only the miri binary is. In particular this means we can kill the sysroot consistency check. :)

@RalfJung
Copy link
Member Author

I confirmed that rustc bootstrap still works with this PR.
@bors r+

@bors
Copy link
Contributor

bors commented May 10, 2020

📌 Commit 12114c5 has been approved by RalfJung

@bors
Copy link
Contributor

bors commented May 10, 2020

⌛ Testing commit 12114c5 with merge 1879c59...

bors added a commit that referenced this pull request May 10, 2020
cargo-miri: never invoke rustc

Always go through 'MIRI_BE_RUSTC=1 miri' instead. This is based on @oli-obk's great idea to add a way to make Miri behave like rustc, which already helped us in #1405. Now it means in `cargo-miri` we run *all* crates through the same binary, and use the env var to determine if we compile or interpret them. This makes sure the compiler is consistent.

The `rustc` binary of the current toolchain is now not used at all, only the `miri` binary is. In particular this means we can kill the sysroot consistency check. :)
@RalfJung
Copy link
Member Author

Oh and we also do not need to pass RUSTFLAGS to xargo any more as we use miri-as-rustc to build libstd, and that already has the default flags we want.

@RalfJung
Copy link
Member Author

@bors retry r+

@bors
Copy link
Contributor

bors commented May 10, 2020

📌 Commit 845b89c has been approved by RalfJung

@bors
Copy link
Contributor

bors commented May 10, 2020

⌛ Testing commit 845b89c with merge 4c78479...

@bors
Copy link
Contributor

bors commented May 10, 2020

☀️ Test successful - checks-travis, status-appveyor
Approved by: RalfJung
Pushing 4c78479 to master...

@bors bors merged commit 4c78479 into rust-lang:master May 10, 2020
@RalfJung RalfJung deleted the miri-as-rustc branch May 10, 2020 17:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants