Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-04 13:10:20 +01:00
Code Issues Projects Releases Packages Wiki Activity

Use is_linux to check for current platform instead of relying on sys.platform

Browse source
This commit is contained in:
marmeladema 2019-12-09 23:01:34 +00:00
parent 17233f2dd2
commit 02c55e2eca
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
python/servo/command_base.py
View file

@ -258,7 +258,7 @@ def gstreamer_root(target, env, topdir=None):
return env.get(gst_env) return env.get(gst_env)
elif os.path.exists(path.join(gst_default_path, "bin", "ffi-7.dll")): elif os.path.exists(path.join(gst_default_path, "bin", "ffi-7.dll")):
return gst_default_path return gst_default_path
elif sys.platform == "linux2": elif is_linux():
return path.join(topdir, "support", "linux", "gstreamer", "gst") return path.join(topdir, "support", "linux", "gstreamer", "gst")
return None return None
@ -580,7 +580,7 @@ class CommandBase(object):
if "x86_64" not in effective_target or "android" in effective_target: if "x86_64" not in effective_target or "android" in effective_target:
# We don't build gstreamer for non-x86_64 / android yet # We don't build gstreamer for non-x86_64 / android yet
return False return False
if sys.platform == "linux2" or is_windows(): if is_linux() or is_windows():
if path.isdir(gstreamer_root(effective_target, env, self.get_top_dir())): if path.isdir(gstreamer_root(effective_target, env, self.get_top_dir())):
return True return True
else: else:
@ -690,7 +690,7 @@ install them, let us know by filing a bug!")
extra_lib = [libpath] + extra_lib extra_lib = [libpath] + extra_lib
append_to_path_env(path.join(libpath, "pkgconfig"), env, "PKG_CONFIG_PATH") append_to_path_env(path.join(libpath, "pkgconfig"), env, "PKG_CONFIG_PATH")
if sys.platform == "linux2": if is_linux():
distrib, version, _ = distro.linux_distribution() distrib, version, _ = distro.linux_distribution()
distrib = six.ensure_str(distrib) distrib = six.ensure_str(distrib)
version = six.ensure_str(version) version = six.ensure_str(version)