From 92a66ab200b98d42c3f3642402c3a4c0ef44322c Mon Sep 17 00:00:00 2001 From: Mark Simulacrum Date: Fri, 30 Jun 2017 06:53:25 -0600 Subject: [PATCH] Download libstd from alt builders. Otherwise, the downloaded rustc and libstd may be incompatible. --- python/servo/bootstrap_commands.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/python/servo/bootstrap_commands.py b/python/servo/bootstrap_commands.py index ceab1907f460..0570c99fa75c 100644 --- a/python/servo/bootstrap_commands.py +++ b/python/servo/bootstrap_commands.py @@ -135,8 +135,10 @@ def bootstrap_rustc(self, force=False, target=[], stable=False): % (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)) + std_url = "https://s3.amazonaws.com/rust-lang-ci/rustc-builds" + if not self.config["build"]["llvm-assertions"]: + std_url += "-alt" + std_url += ("/%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)