Skip to content

Commit 04025fa

Browse files
authored
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: #140772
2 parents 2aea4b2 + 4f0b60a commit 04025fa

File tree

1 file changed

+2
-1
lines changed
  • src/bootstrap/src/core/build_steps

1 file changed

+2
-1
lines changed

src/bootstrap/src/core/build_steps/dist.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1681,7 +1681,8 @@ impl Step for Extended {
16811681
cmd.run(builder);
16821682
}
16831683

1684-
if target.is_windows() {
1684+
// FIXME(mati865): `gnullvm` here is temporary, remove it once it can host itself
1685+
if target.is_windows() && !target.contains("gnullvm") {
16851686
let exe = tmp.join("exe");
16861687
let _ = fs::remove_dir_all(&exe);
16871688

0 commit comments

Comments
 (0)