diff options
| author | Simon Sapin <simon.sapin@exyr.org> | 2017-11-06 19:05:31 +0100 |
|---|---|---|
| committer | Simon Sapin <simon.sapin@exyr.org> | 2017-11-14 09:08:11 +0100 |
| commit | 3264453284e185fe830ba64b11a98fdab416e2b3 (patch) | |
| tree | 3a6cca40549e3f606b39f21ab7acb644abe20024 /python/servo/command_base.py | |
| parent | 250e1b8c3bf1c1b91813feae18778f0c23bee740 (diff) | |
| download | servo-3264453284e185fe830ba64b11a98fdab416e2b3.tar.gz servo-3264453284e185fe830ba64b11a98fdab416e2b3.zip | |
Stop using "alternate" rustc builds.
With https://github.com/rust-lang/rust/pull/45810,
normal Nightly now has LLVM assertions disabled.
Diffstat (limited to 'python/servo/command_base.py')
| -rw-r--r-- | python/servo/command_base.py | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/python/servo/command_base.py b/python/servo/command_base.py index 4e66ae7427e..09ab3f911c6 100644 --- a/python/servo/command_base.py +++ b/python/servo/command_base.py @@ -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() |