rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Rollup merge of #48637 - segevfiner:restore-rust-mingw-download, r=alexcrichton

Browse Source 
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 #48272

r? @alexcrichton
This commit is contained in:
kennytm
2018-03-03 18:45:47 +08:00
committed by GitHub
parent ad1cc0c1bc 5332d9a8e8
commit fb411d86c6
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/bootstrap/bootstrap.py
View File

@@ -349,6 +349,14 @@ class RustBuild(object):
with open(self.rustc_stamp(), 'w') as rust_stamp: with open(self.rustc_stamp(), 'w') 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-{}-{}.tar.gz".format(
rustc_channel, self.build)
self._download_stage0_helper(filename, "rust-mingw")
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())):