aboutsummaryrefslogtreecommitdiffstats
path: root/python/servo/command_base.py
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2016-12-28 07:37:45 -0800
committerGitHub <noreply@github.com>2016-12-28 07:37:45 -0800
commit7f2da7483b2d0c71a227fb8707eea00b0602d977 (patch)
tree0f86aacbdaea913751152c23a195b9450031a2f1 /python/servo/command_base.py
parent17fe437fb72694763f0f7f1b4701127ebc2ef5aa (diff)
parent687a1844b9cf9eca62f7588a3be8cf2587862dfa (diff)
downloadservo-7f2da7483b2d0c71a227fb8707eea00b0602d977.tar.gz
servo-7f2da7483b2d0c71a227fb8707eea00b0602d977.zip
Auto merge of #14346 - mati865:master, r=UK992,larsberg
Use MSVC toolchain if PLATFORM is defined <!-- Please describe your changes on the following line: --> `VSInstallDir` exists only when Visual Studio is installed. `VS140COMNTOOLS` is defined by installing either Visual Studio or [Visual C++ Build Tools](http://landinghub.visualstudio.com/visual-cpp-build-tools) It will allow to build MSVC based Servo without having to install whole Visual Studio (few GiB). EDIT: Another (maybe cleaner) solution would be reverting https://github.com/servo/servo/commit/63ec96a57d4772a961bea63111c927ccd7c85a91 --- <!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: --> - [ ] `./mach build -d` does not report any errors - [x] `./mach test-tidy` does not report any errors - [ ] These changes fix #__ (github issue number if applicable). <!-- Either: --> - [ ] There are tests for these changes OR - [x] These changes do not require tests because `VS140COMNTOOLS` variable is already used in [mach.bat](https://github.com/servo/servo/blob/master/mach.bat) <!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. --> <!-- 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/14346) <!-- Reviewable:end -->
Diffstat (limited to 'python/servo/command_base.py')
-rw-r--r--python/servo/command_base.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/python/servo/command_base.py b/python/servo/command_base.py
index b0f62e65061..991915d753d 100644
--- a/python/servo/command_base.py
+++ b/python/servo/command_base.py
@@ -110,10 +110,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":