From 02b2b9ccbc7073a3a0adef28d30d4c91978a6324 Mon Sep 17 00:00:00 2001 From: mati865 Date: Wed, 23 Nov 2016 16:07:43 +0100 Subject: [PATCH 1/2] use MSVC toolchain if PLATFORM is defined --- python/servo/command_base.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/python/servo/command_base.py b/python/servo/command_base.py index d277bff55ae..660cd453882 100644 --- a/python/servo/command_base.py +++ b/python/servo/command_base.py @@ -108,10 +108,12 @@ def host_triple(): os_type = "linux-androideabi" elif os_type == "windows": # If we are in a Visual Studio environment, use msvc - if os.getenv("VSInstallDir") is not None: + if os.getenv("PLATFORM") is not None: os_type = "pc-windows-msvc" - else: + elif os.getenv("MSYSTEM") is not None: os_type = "pc-windows-gnu" + else: + os_type = "unknown" elif os_type.startswith("mingw64_nt-") or os_type.startswith("cygwin_nt-"): os_type = "pc-windows-gnu" elif os_type == "freebsd": From 687a1844b9cf9eca62f7588a3be8cf2587862dfa Mon Sep 17 00:00:00 2001 From: mati865 Date: Wed, 7 Dec 2016 19:25:49 +0100 Subject: [PATCH 2/2] remove platform from appveyor.yml --- appveyor.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 109c8aca897..eeab72904bb 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -35,9 +35,6 @@ branches: only: - master -platform: - - x64 - cache: - .servo -> rust-nightly-date, cargo-nightly-build - .cargo -> rust-nightly-date, cargo-nightly-build