Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-02 04:53:39 +01:00
Code Issues Projects Releases Packages Wiki Activity

Stop using "alternate" rustc builds.

Browse source 
With https://github.com/rust-lang/rust/pull/45810,
normal Nightly now has LLVM assertions disabled.
This commit is contained in:
Simon Sapin 2017-11-06 19:05:31 +01:00
parent 250e1b8c3b
commit 3264453284
4 changed files with 18 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

11
python/servo/bootstrap_commands.py
View file

@ -29,7 +29,7 @@ from mach.decorators import (
import servo.bootstrap as bootstrap
from servo.command_base import CommandBase, BIN_SUFFIX, cd
from servo.util import delete, download_bytes, download_file, extract, host_triple
from servo.util import STATIC_RUST_LANG_ORG_DIST, URLOPEN_KWARGS
from servo.util import STATIC_RUST_LANG_ORG_DIST
@CommandProvider
@ -90,15 +90,8 @@ class MachCommands(CommandBase):
# in that directory).
if stable:
base_url = STATIC_RUST_LANG_ORG_DIST
elif self.config["build"]["llvm-assertions"]:
base_url = nightly_dist
else:
import toml
channel = nightly_dist + "/channel-rust-nightly.toml"
manifest = toml.load(urllib2.urlopen(channel, **URLOPEN_KWARGS))
nightly_commit_hash = manifest["pkg"]["rustc"]["git_commit_hash"]
base_url = "https://s3.amazonaws.com/rust-lang-ci/rustc-builds-alt/" + nightly_commit_hash
base_url = nightly_dist
rustc_url = base_url + "/rustc-%s-%s.tar.gz" % (version, host_triple())
tgz_file = rust_dir + '-rustc.tar.gz'

12
python/servo/command_base.py
View file

@ -260,19 +260,9 @@ class CommandBase(object):
self.config["tools"].setdefault("cargo-root", "")
self.config["tools"].setdefault("rustc-with-gold", get_env_bool("SERVO_RUSTC_WITH_GOLD", True))
# https://github.com/rust-lang/rust/pull/39754
triples_with_rustc_alt_builds = [
"x86_64-unknown-linux-gnu",
"x86_64-apple-darwin",
"x86_64-pc-windows-msvc",
]
llvm_assertions_default = ("SERVO_RUSTC_LLVM_ASSERTIONS" in os.environ
or host_triple() not in triples_with_rustc_alt_builds)
self.config.setdefault("build", {})
self.config["build"].setdefault("android", False)
self.config["build"].setdefault("mode", "")
self.config["build"].setdefault("llvm-assertions", llvm_assertions_default)
self.config["build"].setdefault("debug-mozjs", False)
self.config["build"].setdefault("ccache", "")
self.config["build"].setdefault("rustflags", "")
@ -315,8 +305,6 @@ class CommandBase(object):
def rust_install_dir(self):
if self._use_stable_rust:
return self.rust_stable_version()
elif not self.config["build"]["llvm-assertions"]:
return self.rust_nightly_date() + "-alt"
else:
return self.rust_nightly_date()