Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-20 07:08:59 +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

9
python/servo/command_base.py
View file

@ -258,7 +258,6 @@ class CommandBase(object):
self.config["tools"].setdefault("system-cargo", False)
self.config["tools"].setdefault("rust-root", "")
self.config["tools"].setdefault("cargo-root", "")
self.set_use_stable_rust(False)
if not self.config["tools"]["system-cargo"]:
self.config["tools"]["cargo-root"] = path.join(
context.sharedir, "cargo", self.cargo_build_id())
@ -267,6 +266,7 @@ class CommandBase(object):
self.config.setdefault("build", {})
self.config["build"].setdefault("android", False)
self.config["build"].setdefault("mode", "")
self.config["build"].setdefault("llvm-assertions", True)
self.config["build"].setdefault("debug-mozjs", False)
self.config["build"].setdefault("ccache", "")
self.config["build"].setdefault("rustflags", "")
@ -279,6 +279,8 @@ class CommandBase(object):
self.config["android"].setdefault("platform", "android-18")
self.config["android"].setdefault("target", "arm-linux-androideabi")
self.set_use_stable_rust(False)
_use_stable_rust = False
_rust_version = None
_rust_version_is_stable = False
@ -297,8 +299,9 @@ class CommandBase(object):
version = self.rust_version()
if self._use_stable_rust:
return os.path.join(version, "rustc-%s-%s" % (version, host_triple()))
else:
return os.path.join(version, "rustc-nightly-%s" % (host_triple()))
if not self.config["build"]["llvm-assertions"]:
version += "-alt"
return os.path.join(version, "rustc-nightly-%s" % (host_triple()))
def rust_version(self):
if self._rust_version is None or self._use_stable_rust != self._rust_version_is_stable: