From 6b523302e1159a4b89223d2e47f053e67240cf35 Mon Sep 17 00:00:00 2001 From: Simon Sapin Date: Fri, 30 Jun 2017 15:34:46 +0200 Subject: Fetch "alt" rust std build when we do so for rustc --- python/servo/bootstrap_commands.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'python/servo/bootstrap_commands.py') diff --git a/python/servo/bootstrap_commands.py b/python/servo/bootstrap_commands.py index ceab1907f46..7f0be395d73 100644 --- a/python/servo/bootstrap_commands.py +++ b/python/servo/bootstrap_commands.py @@ -135,8 +135,11 @@ class MachCommands(CommandBase): % (version, target_triple)) tgz_file = install_dir + ('rust-std-%s-%s.tar.gz' % (version, target_triple)) else: - std_url = ("https://s3.amazonaws.com/rust-lang-ci/rustc-builds/%s/rust-std-nightly-%s.tar.gz" - % (version, target_triple)) + 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 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) -- cgit v1.2.3