Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-17 20:33:40 +01:00
Code Issues Projects Releases Packages Wiki Activity

mach: macos: Don't let gstreamer override symbols (#37903)

Browse source 
Using DYLD_FALLBACK_LIBRARY_PATH means we first try to link to the
normal libraries and only fallback to looking up symbols in gstreamer if
the symbols were not found elsewhere.
This prevents some linking issues.

Testing: Covered by existing tests. Fix for issue #37811 manually
verified by the reporter.

Signed-off-by: Jonathan Schwender <schwenderjonathan@gmail.com>
This commit is contained in:
Jonathan Schwender 2025-07-08 14:12:03 +08:00 • committed by GitHub
parent f7c86c4393
commit 11bb83d422
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 1 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
ports/servoshell/build.rs
View file

@ -11,9 +11,6 @@ use std::process::Command;
fn git_sha() -> Result<String, String> {
let output = Command::new("git")
.args(["rev-parse", "--short", "HEAD"])
// on macos mach sets DYLD_LIBRARY_PATH since it is needed for unit-tests, but it
// causes git to fail, so we remove it for the git invocation.
.env_remove("DYLD_LIBRARY_PATH")
.output()
.map_err(|e| e.to_string())?;
if output.status.success() {

2
python/servo/command_base.py
View file

@ -466,7 +466,7 @@ class CommandBase(object):
# GStreamer distribution (such as harfbuzz), but we only modify the rpath of the
# target binary (servoshell / libsimpleservo).
if platform.is_macos:
util.prepend_paths_to_env(env, "DYLD_LIBRARY_PATH", os.path.join(gstreamer_root, "lib"))
util.prepend_paths_to_env(env, "DYLD_FALLBACK_LIBRARY_PATH", os.path.join(gstreamer_root, "lib"))
if sys.platform != "win32":
env.setdefault("CC", "clang")