diff options
author | Martin Robinson <mrobinson@igalia.com> | 2024-01-17 10:11:04 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-01-17 09:11:04 +0000 |
commit | d43adb1a92c419680be86e7335f3de84b75fb2ef (patch) | |
tree | 67c573216efc3471827c45e3f0ab88b8b9105e87 /python/servo/platform/macos.py | |
parent | 6a7b450478f69d9d83b0936a0ab28ac2d94761d4 (diff) | |
download | servo-d43adb1a92c419680be86e7335f3de84b75fb2ef.tar.gz servo-d43adb1a92c419680be86e7335f3de84b75fb2ef.zip |
build: Only set PATH for GStreamer (#31078)
The documentation claims that this is the only environment variable that
needs to be set before build.
Diffstat (limited to 'python/servo/platform/macos.py')
-rw-r--r-- | python/servo/platform/macos.py | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/python/servo/platform/macos.py b/python/servo/platform/macos.py index 34f936a3f21..73708af6446 100644 --- a/python/servo/platform/macos.py +++ b/python/servo/platform/macos.py @@ -36,23 +36,9 @@ class MacOS(Base): return GSTREAMER_ROOT def is_gstreamer_installed(self, cross_compilation_target: Optional[str]) -> bool: - if not super().is_gstreamer_installed(cross_compilation_target): - return False - # Servo only supports the official GStreamer distribution on MacOS. - env = os.environ.copy() - self.set_gstreamer_environment_variables_if_necessary( - env, cross_compilation_target, check_installation=False - ) - gst_lib_dir = subprocess.check_output( - ["pkg-config", "--variable=libdir", "gstreamer-1.0"], env=env - ) - if not gst_lib_dir.startswith(bytes(GSTREAMER_ROOT, "utf-8")): - print("GStreamer is installed, but not the official packages.\n" - "Run `./mach bootstrap-gtstreamer` or install packages from " - "https://gstreamer.freedesktop.org/") - return False - return True + # Make sure we use the right `pkg-config`. + return not cross_compilation_target and os.path.exists(GSTREAMER_ROOT) def _platform_bootstrap(self, _force: bool) -> bool: installed_something = False |