diff options
| author | bors <bors@rust-lang.org> | 2020-09-11 06:36:43 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-09-11 06:36:43 +0000 |
| commit | f5b7dd8181b0f483a890f8f3c19d08d6de03a444 (patch) | |
| tree | b0ca362d6f88ce45317b75e86f0f3b58518abdb1 /src | |
| parent | 94b4de0e0793c8921d30e0fb886be712d17db6e5 (diff) | |
| parent | 8754884b78ee6cff99bd72ebdab39629f6ff88c3 (diff) | |
| download | rust-f5b7dd8181b0f483a890f8f3c19d08d6de03a444.tar.gz rust-f5b7dd8181b0f483a890f8f3c19d08d6de03a444.zip | |
Auto merge of #76381 - petrochenkov:nomingwcomp, r=Mark-Simulacrum
rustbuild: Do not use `rust-mingw` component when bootstrapping windows-gnu targets Addresses https://github.com/rust-lang/rust/pull/76326#issuecomment-687273473 (ancient `x86_64-w64-mingw32-gcc` is selected as a linker wrapper, which is not usable in `use_lld=true` mode). Perhaps the comment about incompatible mingw was true in the past, but many things changed since then. With this change I was able to build everything successfully locally using a newer mingw toolchain, if it passes through the older toolchain on CI, then it should be good, I think.
Diffstat (limited to 'src')
| -rw-r--r-- | src/bootstrap/bootstrap.py | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/src/bootstrap/bootstrap.py b/src/bootstrap/bootstrap.py index 4ab23b40ac3..955c72856dc 100644 --- a/src/bootstrap/bootstrap.py +++ b/src/bootstrap/bootstrap.py @@ -398,14 +398,6 @@ class RustBuild(object): with output(self.rustc_stamp()) as rust_stamp: rust_stamp.write(self.date) - # This is required so that we don't mix incompatible MinGW - # libraries/binaries that are included in rust-std with - # the system MinGW ones. - if "pc-windows-gnu" in self.build: - filename = "rust-mingw-{}-{}{}".format( - rustc_channel, self.build, tarball_suffix) - self._download_stage0_helper(filename, "rust-mingw", tarball_suffix) - if self.cargo().startswith(self.bin_root()) and \ (not os.path.exists(self.cargo()) or self.program_out_of_date(self.cargo_stamp())): |