2018-10-24 18:24:11 +00:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
From: Ales Pergl <alpergl@microsoft.com>
|
|
|
|
Date: Mon, 22 Oct 2018 10:45:25 -0700
|
|
|
|
Subject: build_gn.patch
|
|
|
|
|
|
|
|
Chromium's Mac toolchain sets the "install_name" linker parameter only
|
|
|
|
when "is_component_build" is true, but we want to set even if it's false,
|
|
|
|
because we are making a dylib which will be distributed inside a bundle.
|
|
|
|
|
2018-09-14 05:02:16 +00:00
|
|
|
diff --git a/BUILD.gn b/BUILD.gn
|
2018-10-24 18:24:11 +00:00
|
|
|
index 494d33fc041c05acc6698e1bfe26cc3f8820bb6b..947deba96107c931582007ce89917f8896923a6f 100755
|
2018-09-14 05:02:16 +00:00
|
|
|
--- a/BUILD.gn
|
|
|
|
+++ b/BUILD.gn
|
2018-10-24 18:24:11 +00:00
|
|
|
@@ -390,6 +390,10 @@ if (is_component_ffmpeg) {
|
2018-09-14 05:02:16 +00:00
|
|
|
# So we can append below and assume they're defined.
|
|
|
|
ldflags = []
|
|
|
|
|
|
|
|
+ if (!is_component_build && is_mac) {
|
|
|
|
+ ldflags += [ "-Wl,-install_name,@rpath/libffmpeg.dylib" ]
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
if (is_fuchsia || (is_posix && !is_mac)) {
|
|
|
|
# Fixes warnings PIC relocation when building as component.
|
|
|
|
ldflags += [
|