-
Notifications
You must be signed in to change notification settings - Fork 12.7k
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
rustbuild: Move compiler-builtins build logic to manifest #73374
rustbuild: Move compiler-builtins build logic to manifest #73374
Conversation
(rust_highfive has picked a reviewer for you, use r? to override) |
There will be a few more steps before this can help build-std. The root manifest is not included in the src distribution (rust-lang/wg-cargo-std-aware#27). Even if it was, Cargo would need to merge the profiles somehow (possibly just the overrides?) (cc rust-lang/wg-cargo-std-aware#28). |
Oh it's true yeah I don't expect this to "simply by default" help build-std, but at least in this form the information is encoded in a way that build-std has any hope of reading one day! |
@bors r+ One thing I've been thinking about is that more broadly, removing support for configuring these values in config.toml may make some sense. On the other hand, it does seem true that it's nice to have the .gitignore'd nature of config.toml which you can't readily get with Cargo.toml today (due to lack of cargo.toml inheritance) as far as I know. |
📌 Commit 260d5cf has been approved by |
…g-assertions, r=Mark-Simulacrum rustbuild: Move compiler-builtins build logic to manifest This commit moves the compiler-builtins-specific build logic from `src/bootstrap/bin/rustc.rs` into the workspace `Cargo.toml`'s `[profile]` configuration. Now that rust-lang/cargo#7253 is fixed we can ensure that Cargo knows about debug assertions settings, and it can also be configured to specifically disable debug assertions unconditionally for compiler-builtins. This should improve rebuild logic when debug-assertions settings change and also improve build-std integration where Cargo externally now has an avenue to learn how to build compiler-builtins as well.
Seeing a failure in #73768 (comment) , might be y'all, but it might also be a bad interaction with a different PR
|
⌛ Testing commit 260d5cf with merge 3e6c31fa36e8bdd5333aa341f8205bfb3f47ce06... |
💔 Test failed - checks-azure |
This commit moves the compiler-builtins-specific build logic from `src/bootstrap/bin/rustc.rs` into the workspace `Cargo.toml`'s `[profile]` configuration. Now that rust-lang/cargo#7253 is fixed we can ensure that Cargo knows about debug assertions settings, and it can also be configured to specifically disable debug assertions unconditionally for compiler-builtins. This should improve rebuild logic when debug-assertions settings change and also improve build-std integration where Cargo externally now has an avenue to learn how to build compiler-builtins as well.
260d5cf
to
3dfbf0b
Compare
@bors: r=Mark-Simulacrum |
📌 Commit 3dfbf0b has been approved by |
…g-assertions, r=Mark-Simulacrum rustbuild: Move compiler-builtins build logic to manifest This commit moves the compiler-builtins-specific build logic from `src/bootstrap/bin/rustc.rs` into the workspace `Cargo.toml`'s `[profile]` configuration. Now that rust-lang/cargo#7253 is fixed we can ensure that Cargo knows about debug assertions settings, and it can also be configured to specifically disable debug assertions unconditionally for compiler-builtins. This should improve rebuild logic when debug-assertions settings change and also improve build-std integration where Cargo externally now has an avenue to learn how to build compiler-builtins as well.
☀️ Test successful - checks-azure |
Since rust-lang#73374 the rustc wrapper no longer configures debug assertions based on RUSTC_DEBUG_ASSERTIONS environment variable.
…alfJung Remove unused RUSTC_DEBUG_ASSERTIONS Since rust-lang#73374 the rustc wrapper no longer configures debug assertions based on RUSTC_DEBUG_ASSERTIONS environment variable. r? @RalfJung
…alfJung Remove unused RUSTC_DEBUG_ASSERTIONS Since rust-lang#73374 the rustc wrapper no longer configures debug assertions based on RUSTC_DEBUG_ASSERTIONS environment variable. r? @RalfJung
…alfJung Remove unused RUSTC_DEBUG_ASSERTIONS Since rust-lang#73374 the rustc wrapper no longer configures debug assertions based on RUSTC_DEBUG_ASSERTIONS environment variable. r? @RalfJung
…alfJung Remove unused RUSTC_DEBUG_ASSERTIONS Since rust-lang#73374 the rustc wrapper no longer configures debug assertions based on RUSTC_DEBUG_ASSERTIONS environment variable. r? @RalfJung
This commit moves the compiler-builtins-specific build logic from
src/bootstrap/bin/rustc.rs
into the workspaceCargo.toml
's[profile]
configuration. Now that rust-lang/cargo#7253 is fixed we canensure that Cargo knows about debug assertions settings, and it can also
be configured to specifically disable debug assertions unconditionally
for compiler-builtins. This should improve rebuild logic when
debug-assertions settings change and also improve build-std integration
where Cargo externally now has an avenue to learn how to build
compiler-builtins as well.