Skip to content

Commit c54f204

Browse files
committed
Rollup merge of rust-lang#48637 - segevfiner:restore-rust-mingw-download, r=alexcrichton
Fixes rust-lang#47311. r? @nrc
2 parents 9d2f1e5 + 5332d9a commit c54f204

File tree

1 file changed

+8
-0
lines changed

1 file changed

+8
-0
lines changed

src/bootstrap/bootstrap.py

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -351,6 +351,14 @@ def download_stage0(self):
351351
with open(self.rustc_stamp(), 'w') as rust_stamp:
352352
rust_stamp.write(self.date)
353353

354+
# This is required so that we don't mix incompatible MinGW
355+
# libraries/binaries that are included in rust-std with
356+
# the system MinGW ones.
357+
if "pc-windows-gnu" in self.build:
358+
filename = "rust-mingw-{}-{}.tar.gz".format(
359+
rustc_channel, self.build)
360+
self._download_stage0_helper(filename, "rust-mingw")
361+
354362
if self.cargo().startswith(self.bin_root()) and \
355363
(not os.path.exists(self.cargo()) or
356364
self.program_out_of_date(self.cargo_stamp())):

0 commit comments

Comments
 (0)