mirror of
https://github.com/servo/servo.git
synced 2025-08-03 12:40:06 +01:00
Auto merge of #27003 - saschanaz:py3-msvc-deps, r=jdm
Fix Py3 failures when installing MSVC dependencies <!-- Please describe your changes on the following line: --> --- <!-- 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 - [ ] `./mach test-tidy` does not report any errors - [ ] These changes fix #___ (GitHub issue number if applicable) <!-- Either: --> - [ ] There are tests for these changes OR - [ ] These changes do not require tests because ___ <!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.--> <!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->
This commit is contained in:
commit
292704b1f3
2 changed files with 3 additions and 2 deletions
|
@ -271,7 +271,8 @@ def windows_msvc(context, force=False):
|
|||
cmake_path = find_executable("cmake")
|
||||
if cmake_path:
|
||||
cmake = subprocess.Popen([cmake_path, "--version"], stdout=PIPE)
|
||||
cmake_version = cmake.stdout.read().splitlines()[0].replace("cmake version ", "")
|
||||
cmake_version_output = six.ensure_str(cmake.stdout.read()).splitlines()[0]
|
||||
cmake_version = cmake_version_output.replace("cmake version ", "")
|
||||
if LooseVersion(cmake_version) >= LooseVersion(version):
|
||||
return True
|
||||
return False
|
||||
|
|
|
@ -216,7 +216,7 @@ def is_linux():
|
|||
def append_to_path_env(string, env, name):
|
||||
variable = ""
|
||||
if name in env:
|
||||
variable = env[name]
|
||||
variable = six.ensure_str(env[name])
|
||||
if len(variable) > 0:
|
||||
variable += os.pathsep
|
||||
variable += string
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue