2022-08-03 07:51:30 +00:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
|
From: Cheng Zhao <zcbenz@gmail.com>
|
|
|
|
|
Date: Tue, 2 Aug 2022 11:53:00 +0900
|
|
|
|
|
Subject: fix: link with @loader_path/libffmpeg.dylib
|
|
|
|
|
|
|
|
|
|
Submitted to https://chromium-review.googlesource.com/c/chromium/third_party/ffmpeg/+/3803946.
|
|
|
|
|
|
|
|
|
|
When building with `is_component_build=false is_component_ffmpeg=true`,
|
|
|
|
|
we must manually instruct executables to link with the ffmpeg.dylib,
|
|
|
|
|
which is generated at the @loader_path, where for most targets is the
|
|
|
|
|
out/{Release,Debug} dir.
|
|
|
|
|
|
|
|
|
|
Using @rpath is wrong because the @rpath of most targets does not
|
|
|
|
|
include the out dir, and the linker won't be able to find ffmpeg.dylib
|
|
|
|
|
because of so.
|
|
|
|
|
|
|
|
|
|
diff --git a/BUILD.gn b/BUILD.gn
|
2024-03-12 09:15:41 +00:00
|
|
|
index 3cce79931d8416196acd165cde7003806ed5a529..557df069027eaddcc7baa9ebc8f1b1b9dcc50f3e 100644
|
2022-08-03 07:51:30 +00:00
|
|
|
--- a/BUILD.gn
|
|
|
|
|
+++ b/BUILD.gn
|
2024-03-12 09:15:41 +00:00
|
|
|
@@ -441,7 +441,7 @@ if (is_component_ffmpeg) {
|
2022-08-03 07:51:30 +00:00
|
|
|
|
|
|
|
|
if (!is_component_build) {
|
|
|
|
|
if (is_mac) {
|
|
|
|
|
- ldflags += [ "-Wl,-install_name,@rpath/libffmpeg.dylib" ]
|
|
|
|
|
+ ldflags += [ "-Wl,-install_name,@loader_path/libffmpeg.dylib" ]
|
|
|
|
|
} else if (is_linux) {
|
2024-02-29 09:31:13 +00:00
|
|
|
all_dependent_configs =
|
|
|
|
|
[ "//build/config/gcc:rpath_for_built_shared_libraries" ]
|
