user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor gating of mingw

Browse source
This commit is contained in:
Pietro Albini 2021-07-19 15:26:47 +02:00
parent 82faa9caff
commit f4c6d8f77c
No known key found for this signature in database
GPG key ID: CD76B35F7734769E
1 changed files with 4 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/bootstrap/dist.rs
View file

@ -1386,6 +1386,10 @@ impl Step for Extended {
tarballs.push(builder.ensure(Docs { host: target }));
}
if target.contains("windows-gnu") {
tarballs.push(builder.ensure(Mingw { host: target }).expect("missing mingw"));
}
if builder.config.profiler_enabled(target)
|| should_build_extended_tool(builder, "rust-demangler")
{
@ -1404,8 +1408,6 @@ impl Step for Extended {
add_tool!("miri" => Miri { compiler, target });
add_tool!("analysis" => Analysis { compiler, target });
let mingw_installer = builder.ensure(Mingw { host: target });
let etc = builder.src.join("src/etc/installer");
// Avoid producing tarballs during a dry run.
@ -1413,10 +1415,6 @@ impl Step for Extended {
return;
}
if target.contains("pc-windows-gnu") {
tarballs.push(mingw_installer.unwrap());
}
let tarball = Tarball::new(builder, "rust", &target.triple);
let generated = tarball.combine(&tarballs);