diff options
| author | Segev Finer <segev208@gmail.com> | 2018-03-01 14:47:20 +0200 |
|---|---|---|
| committer | Segev Finer <segev208@gmail.com> | 2018-03-01 15:20:07 +0200 |
| commit | 39d0b054cea73614a0c1dd06cd98d3d22eea6b10 (patch) | |
| tree | e351bd5f1e54eb45c6fc8495d91bb08f0d886223 | |
| parent | a85417f5938023d1491b44d94da705f539bb8b17 (diff) | |
| download | rust-39d0b054cea73614a0c1dd06cd98d3d22eea6b10.tar.gz rust-39d0b054cea73614a0c1dd06cd98d3d22eea6b10.zip | |
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
| -rw-r--r-- | src/bootstrap/bootstrap.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/bootstrap/bootstrap.py b/src/bootstrap/bootstrap.py index 5966bb65df9..761cc94c8c6 100644 --- a/src/bootstrap/bootstrap.py +++ b/src/bootstrap/bootstrap.py @@ -351,6 +351,11 @@ class RustBuild(object): with open(self.rustc_stamp(), 'w') as rust_stamp: rust_stamp.write(self.date) + 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())): |