Skip to content

Commit

Permalink
Rollup merge of rust-lang#48637 - segevfiner:restore-rust-mingw-downl…
Browse files Browse the repository at this point in the history
…oad, 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
  • Loading branch information
kennytm authored Mar 3, 2018
2 parents ad1cc0c + 5332d9a commit fb411d8
Showing 1 changed file with 8 additions and 0 deletions.
8 changes: 8 additions & 0 deletions src/bootstrap/bootstrap.py
Original file line number Diff line number Diff line change
Expand Up @@ -349,6 +349,14 @@ def download_stage0(self):
with open(self.rustc_stamp(), 'w') as rust_stamp:
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 \
(not os.path.exists(self.cargo()) or
self.program_out_of_date(self.cargo_stamp())):
Expand Down

0 comments on commit fb411d8

Please sign in to comment.