diff options
| author | kennytm <kennytm@gmail.com> | 2018-03-03 18:45:47 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-03 18:45:47 +0800 |
| commit | fb411d86c6fa9c7475028e166b79a88a457fe4a8 (patch) | |
| tree | d70951b38e53d150f6b8043153afc1a257af6dd1 | |
| parent | ad1cc0c1bce7f85be2930c940e8fb682e81c3205 (diff) | |
| parent | 5332d9a8e8a66e22b8c81f3f302ce72734ba137f (diff) | |
| download | rust-fb411d86c6fa9c7475028e166b79a88a457fe4a8.tar.gz rust-fb411d86c6fa9c7475028e166b79a88a457fe4a8.zip | |
Rollup merge of #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 #48272 r? @alexcrichton
| -rw-r--r-- | src/bootstrap/bootstrap.py | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/bootstrap/bootstrap.py b/src/bootstrap/bootstrap.py index cc5ee53affc..77df372d4fa 100644 --- a/src/bootstrap/bootstrap.py +++ b/src/bootstrap/bootstrap.py @@ -349,6 +349,14 @@ class RustBuild(object): 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())): |