Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-25 17:44:33 +01:00
Code Issues Projects Releases Packages Wiki Activity

Allow disabling LLVM assertions in rustc (fixes #15548)

Browse source
This commit is contained in:
Anthony Ramine 2017-02-15 11:47:03 +01:00 • committed by Simon Sapin
parent 336e6c8f28
commit 57fd45a5c2
3 changed files with 15 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
python/servo/bootstrap_commands.py
View file

@ -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)