diff options
| author | Mazdak Farrokhzad <twingoow@gmail.com> | 2019-08-29 17:13:59 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-29 17:13:59 +0200 |
| commit | 78e728e2c20a61dad6d73d9fcb1927668c75c416 (patch) | |
| tree | b8b250496a319074bad1e5c5e8bca8de120b4ea3 | |
| parent | 1ea8fc587cc7166f901e05d991d5dae75ec1d101 (diff) | |
| parent | c9bf5c0bffef595136b484b0282ade18894cf5af (diff) | |
| download | rust-78e728e2c20a61dad6d73d9fcb1927668c75c416.tar.gz rust-78e728e2c20a61dad6d73d9fcb1927668c75c416.zip | |
Rollup merge of #63953 - crlf0710:bootstrap_mirroring, r=Mark-Simulacrum
bootstrap: allow specifying mirror for bootstrap compiler download.
| -rw-r--r-- | src/bootstrap/bootstrap.py | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/src/bootstrap/bootstrap.py b/src/bootstrap/bootstrap.py index 3c56131396f..4162fe1df50 100644 --- a/src/bootstrap/bootstrap.py +++ b/src/bootstrap/bootstrap.py @@ -320,7 +320,7 @@ class RustBuild(object): def __init__(self): self.cargo_channel = '' self.date = '' - self._download_url = 'https://static.rust-lang.org' + self._download_url = '' self.rustc_channel = '' self.build = '' self.build_dir = os.path.join(os.getcwd(), "build") @@ -733,9 +733,19 @@ class RustBuild(object): self.update_submodule(module[0], module[1], recorded_submodules) print("Submodules updated in %.2f seconds" % (time() - start_time)) + def set_normal_environment(self): + """Set download URL for normal environment""" + if 'RUSTUP_DIST_SERVER' in os.environ: + self._download_url = os.environ['RUSTUP_DIST_SERVER'] + else: + self._download_url = 'https://static.rust-lang.org' + def set_dev_environment(self): """Set download URL for development environment""" - self._download_url = 'https://dev-static.rust-lang.org' + if 'RUSTUP_DEV_DIST_SERVER' in os.environ: + self._download_url = os.environ['RUSTUP_DEV_DIST_SERVER'] + else: + self._download_url = 'https://dev-static.rust-lang.org' def check_vendored_status(self): """Check that vendoring is configured properly""" @@ -828,6 +838,8 @@ def bootstrap(help_triggered): if 'dev' in data: build.set_dev_environment() + else: + build.set_normal_environment() build.update_submodules() |
