wix: allow to skip more components #135255
Conversation
|
rustbot has assigned @Mark-Simulacrum. Use |
rustbot
added
S-waiting-on-review
| built_tools: &HashSet<&'static str>, | ||
| ) { | ||
| // envs for wix should be always defined, even if not used | ||
| // FIXME: is they affect ccache? |
There was a problem hiding this comment.
What is this referring to? I don't think we use (s?)ccache for Wix invocations?
It's also not clear to me what we mean by "should always be defined even if not used". Can you elaborate? What happens if we get that wrong?
There was a problem hiding this comment.
Reference to sccache because this comment from pr with attempt to bump sccache, should be deleted.
As for "defined" - wix fails to build if it can't find all associated with components env vars. i.e. for rustfmt - which is optional, env var CFG_RUSTFMT should be always set (with 1 or 0 value), doesn't matter if it rustfmt component build or not. Hmm, need rephrase this.
Mark-Simulacrum
added
S-waiting-on-author
|
@klensy |
|
I can take over the work to push it over finish line. Thanks @klensy for initial effort! |
|
Closing this as it's superseded by #138606 |
…imulacrum Fix missing rustfmt in msi installer - cont ## Context - This PR extended and fixed rust-lang#131365, which was reverted in rust-lang#135253 - Initial effort from `@klensy` in rust-lang#135255 (at any points if you feel like picking this up again, let me know I'll close my PR! Just trying to push this through since it's my mistake in the original commits) - Tested with both `beta` and `nightly` `rust.channel` r? `@Mark-Simulacrum`
Rollup merge of rust-lang#138606 - heiseish:131365-extended, r=Mark-Simulacrum Fix missing rustfmt in msi installer - cont ## Context - This PR extended and fixed rust-lang#131365, which was reverted in rust-lang#135253 - Initial effort from `@klensy` in rust-lang#135255 (at any points if you feel like picking this up again, let me know I'll close my PR! Just trying to push this through since it's my mistake in the original commits) - Tested with both `beta` and `nightly` `rust.channel` r? `@Mark-Simulacrum`
Initially this fixed try builds for
dist-x86_64-msvcwhen i played with it #133033 (comment)Looking at errors, it should probably fix issues with beta\stable bumps too: #133447 (comment) #135163 (comment)
This makes tools like clippy/rustfmt/(and miri, which is nightly only component)/etc optional for msi, so they can be turned on/off by dist.