aboutsummaryrefslogtreecommitdiffstats
path: root/python/servo/command_base.py
diff options
context:
space:
mode:
authorMartin Robinson <mrobinson@igalia.com>2024-01-17 10:11:04 +0100
committerGitHub <noreply@github.com>2024-01-17 09:11:04 +0000
commitd43adb1a92c419680be86e7335f3de84b75fb2ef (patch)
tree67c573216efc3471827c45e3f0ab88b8b9105e87 /python/servo/command_base.py
parent6a7b450478f69d9d83b0936a0ab28ac2d94761d4 (diff)
downloadservo-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/command_base.py')
-rw-r--r--python/servo/command_base.py8
1 files changed, 6 insertions, 2 deletions
diff --git a/python/servo/command_base.py b/python/servo/command_base.py
index e4e1642e9ec..a6ea3add044 100644
--- a/python/servo/command_base.py
+++ b/python/servo/command_base.py
@@ -498,9 +498,13 @@ class CommandBase(object):
"""Return an extended environment dictionary."""
env = os.environ.copy()
+ # If we are installing on MacOS and Windows, we need to make sure that GStreamer's
+ # `pkg-config` is on the path and takes precedence over other `pkg-config`s.
if self.enable_media and not self.is_android_build:
- servo.platform.get().set_gstreamer_environment_variables_if_necessary(
- env, cross_compilation_target=self.cross_compile_target)
+ platform = servo.platform.get()
+ gstreamer_root = platform.gstreamer_root(cross_compilation_target=self.cross_compile_target)
+ if gstreamer_root:
+ util.prepend_paths_to_env(env, "PATH", os.path.join(gstreamer_root, "bin"))
effective_target = self.cross_compile_target or servo.platform.host_triple()
if "msvc" in effective_target: