Skip to content

Commit fb411d8

Browse files
authored
Rollup merge of rust-lang#48637 - segevfiner:restore-rust-mingw-download, r=alexcrichton
Restore the download of rust-mingw The build might otherwise break due to mixing MinGW object files from rust-std and the local MinGW which might be newer/older than the version used to build rust-std. Fixes rust-lang#48272 r? @alexcrichton
2 parents ad1cc0c + 5332d9a commit fb411d8

File tree

1 file changed

+8
-0
lines changed

1 file changed

+8
-0
lines changed

src/bootstrap/bootstrap.py

+8
Original file line numberDiff line numberDiff line change
@@ -349,6 +349,14 @@ def download_stage0(self):
349349
with open(self.rustc_stamp(), 'w') as rust_stamp:
350350
rust_stamp.write(self.date)
351351

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

0 commit comments

Comments
 (0)