From d43adb1a92c419680be86e7335f3de84b75fb2ef Mon Sep 17 00:00:00 2001 From: Martin Robinson Date: Wed, 17 Jan 2024 10:11:04 +0100 Subject: build: Only set PATH for GStreamer (#31078) The documentation claims that this is the only environment variable that needs to be set before build. --- python/servo/platform/macos.py | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) (limited to 'python/servo/platform/macos.py') 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 -- cgit v1.2.3