Skip to content

gnullvm hosts: add to build-manifest - #149503

Closed
mati865 wants to merge 1 commit into
rust-lang:mainfrom
mati865:gnullvm-build-manifest
Closed

gnullvm hosts: add to build-manifest#149503
mati865 wants to merge 1 commit into
rust-lang:mainfrom
mati865:gnullvm-build-manifest

Conversation

@mati865

@mati865mati865 commented Dec 1, 2025

Copy link
Copy Markdown
Member

A continuation of #147536 and #148751 fixing what I missed there.

After this change rustup install nightly-x86_64-pc-windows-gnullvm --component rust-mingw should work.

@rustbotrustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Dec 1, 2025
@rustbot

Copy link
Copy Markdown
Collaborator

r? @Mark-Simulacrum

rustbot has assigned @Mark-Simulacrum.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

"i686-pc-windows-msvc",
"x86_64-pc-windows-gnu",
"x86_64-pc-windows-gnullvm",
"x86_64-pc-windows-msvc",

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we reasonably replace this with just "target contains windows in the name" or something like that?

I'd like to drive down the need for these to be here similar to how we moved the tier information into rustc itself.

@mati865mati865Dec 2, 2025

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It'd have to be something along target.contains("windows") && target.has_host_tools().

I think it should be possible to utilise HOSTS array from your recent PR for that.

@Mark-Simulacrum

Copy link
Copy Markdown
Member

Replaced by #149554 AFAICT.

@rustbotrustbot removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Dec 4, 2025
@mati865
mati865 deleted the gnullvm-build-manifest branch December 4, 2025 03:32
Zalathar added a commit to Zalathar/rust that referenced this pull request Dec 4, 2025
…=Mark-Simulacrum
build-manifest: generate MSI and MINGW arrays from rustc
An alternative to rust-lang#149503
The arrays after generating:
```
❯ bat -n build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-linux-gnu/release/build/build-manifest-e0236666c7c4187b/out/targets.rs | rg MSI -A14
136 static MSI_INSTALLERS: &[&str] = &[
137 "aarch64-pc-windows-gnullvm",
138 "aarch64-pc-windows-msvc",
139 "i686-pc-windows-gnu",
140 "i686-pc-windows-msvc",
141 "x86_64-pc-windows-gnu",
142 "x86_64-pc-windows-gnullvm",
143 "x86_64-pc-windows-msvc",
144 ];
145 static MINGW: &[&str] = &[
146 "aarch64-pc-windows-gnullvm",
147 "i686-pc-windows-gnu",
148 "x86_64-pc-windows-gnu",
149 "x86_64-pc-windows-gnullvm",
150 ];
```
r? `@Mark-Simulacrum`
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Dec 4, 2025
…=Mark-Simulacrum
build-manifest: generate MSI and MINGW arrays from rustc
An alternative to rust-lang#149503
The arrays after generating:
```
❯ bat -n build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-linux-gnu/release/build/build-manifest-e0236666c7c4187b/out/targets.rs | rg MSI -A14
136 static MSI_INSTALLERS: &[&str] = &[
137 "aarch64-pc-windows-gnullvm",
138 "aarch64-pc-windows-msvc",
139 "i686-pc-windows-gnu",
140 "i686-pc-windows-msvc",
141 "x86_64-pc-windows-gnu",
142 "x86_64-pc-windows-gnullvm",
143 "x86_64-pc-windows-msvc",
144 ];
145 static MINGW: &[&str] = &[
146 "aarch64-pc-windows-gnullvm",
147 "i686-pc-windows-gnu",
148 "x86_64-pc-windows-gnu",
149 "x86_64-pc-windows-gnullvm",
150 ];
```
r? ``@Mark-Simulacrum``
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Dec 4, 2025
…=Mark-Simulacrum
build-manifest: generate MSI and MINGW arrays from rustc
An alternative to rust-lang#149503
The arrays after generating:
```
❯ bat -n build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-linux-gnu/release/build/build-manifest-e0236666c7c4187b/out/targets.rs | rg MSI -A14
136 static MSI_INSTALLERS: &[&str] = &[
137 "aarch64-pc-windows-gnullvm",
138 "aarch64-pc-windows-msvc",
139 "i686-pc-windows-gnu",
140 "i686-pc-windows-msvc",
141 "x86_64-pc-windows-gnu",
142 "x86_64-pc-windows-gnullvm",
143 "x86_64-pc-windows-msvc",
144 ];
145 static MINGW: &[&str] = &[
146 "aarch64-pc-windows-gnullvm",
147 "i686-pc-windows-gnu",
148 "x86_64-pc-windows-gnu",
149 "x86_64-pc-windows-gnullvm",
150 ];
```
r? ```@Mark-Simulacrum```
rust-timer added a commit that referenced this pull request Dec 4, 2025
Rollup merge of #149554 - mati865:build-manifest-more-gen, r=Mark-Simulacrum
build-manifest: generate MSI and MINGW arrays from rustc
An alternative to #149503
The arrays after generating:
```
❯ bat -n build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-linux-gnu/release/build/build-manifest-e0236666c7c4187b/out/targets.rs | rg MSI -A14
136 static MSI_INSTALLERS: &[&str] = &[
137 "aarch64-pc-windows-gnullvm",
138 "aarch64-pc-windows-msvc",
139 "i686-pc-windows-gnu",
140 "i686-pc-windows-msvc",
141 "x86_64-pc-windows-gnu",
142 "x86_64-pc-windows-gnullvm",
143 "x86_64-pc-windows-msvc",
144 ];
145 static MINGW: &[&str] = &[
146 "aarch64-pc-windows-gnullvm",
147 "i686-pc-windows-gnu",
148 "x86_64-pc-windows-gnu",
149 "x86_64-pc-windows-gnullvm",
150 ];
```
r? ```@Mark-Simulacrum```
Sign up for freeto 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.

3 participants

@mati865@rustbot@Mark-Simulacrum