Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-15 19:33:46 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #19076 - servo:alt-triples, r=mbrubeck

Browse source 
Check full triples for "alt" compiler support, not just platforms.

Fixes https://github.com/servo/servo/issues/19075
Fixes https://github.com/servo/servo/issues/18227

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/19076)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2017-10-31 18:14:53 -05:00 • committed by GitHub
commit c18f412ba3
1 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
python/servo/command_base.py
View file

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