diff options
| author | León Orell Valerian Liehr <me@fmease.dev> | 2025-06-10 16:54:47 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-06-10 16:54:47 +0200 |
| commit | 04025fae87da7b9a7139d8c3c779a098cb6ab1c6 (patch) | |
| tree | a195ed0ea4fcface6745a2ffcf55dddd020293b8 | |
| parent | 2aea4b2bf1db64e383e872e9160733a2591e559a (diff) | |
| parent | 4f0b60aa7146297e2f73f48449ffe7e4f74e679a (diff) | |
| download | rust-04025fae87da7b9a7139d8c3c779a098cb6ab1c6.tar.gz rust-04025fae87da7b9a7139d8c3c779a098cb6ab1c6.zip | |
Rollup merge of #141818 - mati865:dont-create-msi-from-non-windows, r=Kobzol
Don't create .msi installer for gnullvm hosts WIX toolset works only on Windows hosts, but gnullvm doesn't have host toolchain yet. To get out of this loop, we will create a single release without MSI installer. Split out from: https://github.com/rust-lang/rust/pull/140772
| -rw-r--r-- | src/bootstrap/src/core/build_steps/dist.rs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/bootstrap/src/core/build_steps/dist.rs b/src/bootstrap/src/core/build_steps/dist.rs index 587fca80374..7aa9e6cc2b5 100644 --- a/src/bootstrap/src/core/build_steps/dist.rs +++ b/src/bootstrap/src/core/build_steps/dist.rs @@ -1681,7 +1681,8 @@ impl Step for Extended { cmd.run(builder); } - if target.is_windows() { + // FIXME(mati865): `gnullvm` here is temporary, remove it once it can host itself + if target.is_windows() && !target.contains("gnullvm") { let exe = tmp.join("exe"); let _ = fs::remove_dir_all(&exe); |