-
Notifications
You must be signed in to change notification settings - Fork 13k
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
bootstrap: clear miri's ui test deps when rustc changes #128683
Conversation
r? @onur-ozkan |
rust-lang/miri#3790 makes us use a Miri-specific folder. |
a4ed764
to
2b584dc
Compare
@rustbot ready |
@bors r+ rollup |
…llaumeGomez Rollup of 9 pull requests Successful merges: - rust-lang#128206 (Make create_dll_import_lib easier to implement) - rust-lang#128424 (minor `effects` cleanups) - rust-lang#128527 (More information for fully-qualified suggestion when there are multiple impls) - rust-lang#128656 (Enable msvc for run-make/rust-lld) - rust-lang#128683 (bootstrap: clear miri's ui test deps when rustc changes) - rust-lang#128700 (Migrate `simd-ffi` `run-make` test to rmake) - rust-lang#128753 (Don't arbitrarily choose one upper bound for hidden captured region error message) - rust-lang#128757 (Migrate `pgo-gen-lto` `run-make` test to rmake) - rust-lang#128758 (Specify a minimum supported version for VxWorks) Failed merges: - rust-lang#128679 (codegen: better centralize function declaration attribute computation) r? `@ghost` `@rustbot` modify labels: rollup
Rollup merge of rust-lang#128683 - RalfJung:miri-ui-test-deps, r=onur-ozkan bootstrap: clear miri's ui test deps when rustc changes `@onur-ozkan` I hope this makes sense... it's quite hard to test this, but it did at least cause one rebuild of the right files for me, and then it doesn't seem to keep rebuilding, so at first sight this look at least better than the status quo.
I'm afraid only clearing when rustc changes isn't enough... we need to also clear whenever the Miri sysroot gets rebuilt. Cargo doesn't seem to recognize that the standard library changes, and then we still get build failures as before. I don't know a good way to implement that, though... |
We could clear it unconditionally in a similar way to how we handle docs: rust/src/bootstrap/src/core/builder.rs Lines 1495 to 1510 in 730d5d4
|
…nur-ozkan bootstrap: clear miri ui-test deps when miri sysroot gets rebuilt Second attempt after rust-lang#128683: seems like it's not the compiler changing that we care about, but the sysroot changing. I did some local testing with sysroot rebuilds and it works fine for at least those cases I checked. r? `@onur-ozkan`
…nur-ozkan bootstrap: clear miri ui-test deps when miri sysroot gets rebuilt Second attempt after rust-lang#128683: seems like it's not the compiler changing that we care about, but the sysroot changing. I did some local testing with sysroot rebuilds and it works fine for at least those cases I checked. r? `@onur-ozkan`
…nur-ozkan bootstrap: clear miri ui-test deps when miri sysroot gets rebuilt Second attempt after rust-lang#128683: seems like it's not the compiler changing that we care about, but the sysroot changing. I did some local testing with sysroot rebuilds and it works fine for at least those cases I checked. r? ``@onur-ozkan``
Rollup merge of rust-lang#129000 - RalfJung:miri-bootstrap-clear, r=onur-ozkan bootstrap: clear miri ui-test deps when miri sysroot gets rebuilt Second attempt after rust-lang#128683: seems like it's not the compiler changing that we care about, but the sysroot changing. I did some local testing with sysroot rebuilds and it works fine for at least those cases I checked. r? ``@onur-ozkan``
@onur-ozkan I hope this makes sense... it's quite hard to test this, but it did at least cause one rebuild of the right files for me, and then it doesn't seem to keep rebuilding, so at first sight this look at least better than the status quo.