diff options
| author | Simon Sapin <simon.sapin@exyr.org> | 2017-10-31 22:13:19 +0100 |
|---|---|---|
| committer | Simon Sapin <simon.sapin@exyr.org> | 2017-10-31 22:13:19 +0100 |
| commit | 93717356f1207b4761780d2ca4aad2ef5f54901b (patch) | |
| tree | c1ca7e75a02521db981f1f70622e46225cdf1e39 /python/servo/command_base.py | |
| parent | a376382ed06dce1aa4a63138270b3131375ed5ed (diff) | |
| download | servo-93717356f1207b4761780d2ca4aad2ef5f54901b.tar.gz servo-93717356f1207b4761780d2ca4aad2ef5f54901b.zip | |
Check full triples for "alt" compiler support, not just platforms.
Fixes https://github.com/servo/servo/issues/19075
Diffstat (limited to 'python/servo/command_base.py')
| -rw-r--r-- | python/servo/command_base.py | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/python/servo/command_base.py b/python/servo/command_base.py index 77bb88886fa..7dbbaa701a0 100644 --- a/python/servo/command_base.py +++ b/python/servo/command_base.py @@ -23,7 +23,7 @@ from mach.registrar import Registrar import toml from servo.packages import WINDOWS_MSVC as msvc_deps -from servo.util import host_triple, host_platform +from servo.util import host_triple BIN_SUFFIX = ".exe" if sys.platform == "win32" else "" @@ -261,9 +261,13 @@ class CommandBase(object): self.config["tools"].setdefault("rustc-with-gold", get_env_bool("SERVO_RUSTC_WITH_GOLD", True)) # https://github.com/rust-lang/rust/pull/39754 - platforms_with_rustc_alt_builds = ["unknown-linux-gnu", "apple-darwin", "pc-windows-msvc"] + 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_platform() not in platforms_with_rustc_alt_builds) + or host_triple() not in triples_with_rustc_alt_builds) self.config.setdefault("build", {}) self.config["build"].setdefault("android", False) |