diff options
| author | Simon Sapin <simon.sapin@exyr.org> | 2017-11-06 19:05:31 +0100 |
|---|---|---|
| committer | Simon Sapin <simon.sapin@exyr.org> | 2017-11-14 09:08:11 +0100 |
| commit | 3264453284e185fe830ba64b11a98fdab416e2b3 (patch) | |
| tree | 3a6cca40549e3f606b39f21ab7acb644abe20024 /python/servo/bootstrap_commands.py | |
| parent | 250e1b8c3bf1c1b91813feae18778f0c23bee740 (diff) | |
| download | servo-3264453284e185fe830ba64b11a98fdab416e2b3.tar.gz servo-3264453284e185fe830ba64b11a98fdab416e2b3.zip | |
Stop using "alternate" rustc builds.
With https://github.com/rust-lang/rust/pull/45810,
normal Nightly now has LLVM assertions disabled.
Diffstat (limited to 'python/servo/bootstrap_commands.py')
| -rw-r--r-- | python/servo/bootstrap_commands.py | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/python/servo/bootstrap_commands.py b/python/servo/bootstrap_commands.py index 54d620d9750..ba583735011 100644 --- a/python/servo/bootstrap_commands.py +++ b/python/servo/bootstrap_commands.py @@ -29,7 +29,7 @@ from mach.decorators import ( import servo.bootstrap as bootstrap from servo.command_base import CommandBase, BIN_SUFFIX, cd from servo.util import delete, download_bytes, download_file, extract, host_triple -from servo.util import STATIC_RUST_LANG_ORG_DIST, URLOPEN_KWARGS +from servo.util import STATIC_RUST_LANG_ORG_DIST @CommandProvider @@ -90,15 +90,8 @@ class MachCommands(CommandBase): # in that directory). if stable: base_url = STATIC_RUST_LANG_ORG_DIST - elif self.config["build"]["llvm-assertions"]: - base_url = nightly_dist else: - import toml - channel = nightly_dist + "/channel-rust-nightly.toml" - manifest = toml.load(urllib2.urlopen(channel, **URLOPEN_KWARGS)) - nightly_commit_hash = manifest["pkg"]["rustc"]["git_commit_hash"] - - base_url = "https://s3.amazonaws.com/rust-lang-ci/rustc-builds-alt/" + nightly_commit_hash + base_url = nightly_dist rustc_url = base_url + "/rustc-%s-%s.tar.gz" % (version, host_triple()) tgz_file = rust_dir + '-rustc.tar.gz' |