Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-05 21:50:18 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #17727 - servo:rustup, r=nox

Browse source 
Upgrade to rustc 1.20.0-nightly (ab91c70cc 2017-07-14), use non-"alt" std

<s>Possibly</s> fixes https://github.com/servo/servo/pull/17604

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/17727)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2017-07-17 05:06:01 -07:00 • committed by GitHub
commit 9d30e5b4e0
2 changed files with 3 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

7
python/servo/bootstrap_commands.py
View file

@ -135,11 +135,8 @@ class MachCommands(CommandBase):
% (version, target_triple))
tgz_file = install_dir + ('rust-std-%s-%s.tar.gz' % (version, target_triple))
else:
tarball = "%s/rust-std-nightly-%s.tar.gz" % (version, target_triple)
base_url = "https://s3.amazonaws.com/rust-lang-ci/rustc-builds"
if not self.config["build"]["llvm-assertions"]:
base_url += "-alt"
std_url = base_url + "/" + tarball
std_url = ("https://s3.amazonaws.com/rust-lang-ci/rustc-builds/%s/rust-std-nightly-%s.tar.gz"
% (version, target_triple))
tgz_file = install_dir + ('rust-std-nightly-%s.tar.gz' % target_triple)
download_file("Host rust library for target %s" % target_triple, std_url, tgz_file)

2
rust-commit-hash
View file

@ -1 +1 @@
f85579d4a2c342654f9b158fafd565eb159fdb59
ab91c70cc69450bc69b76df0fd2faa82bda42d6b