Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-28 19:13:41 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix Py3 failures when installing MSVC dependencies

Browse source
This commit is contained in:
Kagami Sascha Rosylight 2020-06-20 16:40:01 +02:00
parent 0b61cfc3ae
commit 74e0d02c03
2 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
python/servo/bootstrap.py
View file

@ -271,7 +271,8 @@ def windows_msvc(context, force=False):
cmake_path = find_executable("cmake") cmake_path = find_executable("cmake")
if cmake_path: if cmake_path:
cmake = subprocess.Popen([cmake_path, "--version"], stdout=PIPE) 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): if LooseVersion(cmake_version) >= LooseVersion(version):
return True return True
return False return False

2
python/servo/command_base.py
View file

@ -216,7 +216,7 @@ def is_linux():
def append_to_path_env(string, env, name): def append_to_path_env(string, env, name):
variable = "" variable = ""
if name in env: if name in env:
variable = env[name] variable = six.ensure_str(env[name])
if len(variable) > 0: if len(variable) > 0:
variable += os.pathsep variable += os.pathsep
variable += string variable += string