bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Auto merge of #76381 - petrochenkov:nomingwcomp, r=Mark-Simulacrum

Browse source 
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.
This commit is contained in:
bors 2020-09-11 06:36:43 +00:00
commit f5b7dd8181
1 changed files with 0 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/bootstrap/bootstrap.py
View file

@ -398,14 +398,6 @@ class RustBuild(object):
with output(self.rustc_stamp()) as rust_stamp: with output(self.rustc_stamp()) as rust_stamp:
rust_stamp.write(self.date) 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 \ if self.cargo().startswith(self.bin_root()) and \
(not os.path.exists(self.cargo()) or (not os.path.exists(self.cargo()) or
self.program_out_of_date(self.cargo_stamp())): self.program_out_of_date(self.cargo_stamp())):