Skip to content

Commit f5b7dd8

Browse files
committed
Auto merge of #76381 - petrochenkov:nomingwcomp, r=Mark-Simulacrum
rustbuild: Do not use `rust-mingw` component when bootstrapping windows-gnu targets Addresses #76326 (comment) (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.
2 parents 94b4de0 + 8754884 commit f5b7dd8

File tree

1 file changed

+0
-8
lines changed

1 file changed

+0
-8
lines changed

src/bootstrap/bootstrap.py

-8
Original file line numberDiff line numberDiff line change
@@ -398,14 +398,6 @@ def support_xz():
398398
with output(self.rustc_stamp()) as rust_stamp:
399399
rust_stamp.write(self.date)
400400

401-
# This is required so that we don't mix incompatible MinGW
402-
# libraries/binaries that are included in rust-std with
403-
# the system MinGW ones.
404-
if "pc-windows-gnu" in self.build:
405-
filename = "rust-mingw-{}-{}{}".format(
406-
rustc_channel, self.build, tarball_suffix)
407-
self._download_stage0_helper(filename, "rust-mingw", tarball_suffix)
408-
409401
if self.cargo().startswith(self.bin_root()) and \
410402
(not os.path.exists(self.cargo()) or
411403
self.program_out_of_date(self.cargo_stamp())):

0 commit comments

Comments
 (0)