Allow disabling LLVM assertions in rustc (fixes #15548)

1 files changed, 6 insertions, 1 deletions

diff --git a/python/servo/bootstrap_commands.py b/python/servo/bootstrap_commands.py
index ee29bce06db..aa298611825 100644
--- a/python/servo/bootstrap_commands.py
+++ b/python/servo/bootstrap_commands.py
@@ -70,6 +70,8 @@ class MachCommands(CommandBase):
         rust_path = self.rust_path()
         rust_dir = path.join(self.context.sharedir, "rust", rust_path)
         install_dir = path.join(self.context.sharedir, "rust", version)
+        if not self.config["build"]["llvm-assertions"]:
+            install_dir += "-alt"
 
         if not force and path.exists(path.join(rust_dir, "rustc", "bin", "rustc" + BIN_SUFFIX)):
             print("Rust compiler already downloaded.", end=" ")
@@ -89,7 +91,10 @@ class MachCommands(CommandBase):
                 rustc_url = "https://static-rust-lang-org.s3.amazonaws.com/dist/" + tarball
             else:
                 tarball = "%s/rustc-nightly-%s.tar.gz" % (version, host_triple())
-                rustc_url = "https://s3.amazonaws.com/rust-lang-ci/rustc-builds/" + tarball
+                base_url = "https://s3.amazonaws.com/rust-lang-ci/rustc-builds"
+                if not self.config["build"]["llvm-assertions"]:
+                    base_url += "-alt"
+                rustc_url = base_url + "/" + tarball
             tgz_file = rust_dir + '-rustc.tar.gz'
 
             download_file("Rust compiler", rustc_url, tgz_file)