[vlc-commits] freetype: Fix compilation on macOS

David Fuhrmann git at videolan.org
Mon May 21 19:37:50 CEST 2018


vlc/vlc-3.0 | branch: master | David Fuhrmann <dfuhrmann at videolan.org> | Sat May 19 13:17:39 2018 +0200| [5b749f7af3ba8b94d422161c0a49fb21165803ea] | committer: Jean-Baptiste Kempf

freetype: Fix compilation on macOS

Usually, the per-target _LINK variable is autogenerated, taking
into account used languages based on file extension, and also
per-target _LDFLAGS. Due to #17827, _LINK for this module is
explicitly overridden, and therefore the per-target _LDFLAGS are not
respected, which leads to compilation failure.

This is a quick fix to make macOS compile again. The problem
affects all platforms however, and a better solution shall be found
later.

(cherry picked from commit ad1e9416b0063e9437b124082d0962f051d552da)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=5b749f7af3ba8b94d422161c0a49fb21165803ea
---

 modules/text_renderer/Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/text_renderer/Makefile.am b/modules/text_renderer/Makefile.am
index a251904762..41b370788d 100644
--- a/modules/text_renderer/Makefile.am
+++ b/modules/text_renderer/Makefile.am
@@ -34,7 +34,7 @@ libfreetype_plugin_la_SOURCES += text_renderer/freetype/fonts/android.c
 endif
 if HAVE_DARWIN
 libfreetype_plugin_la_SOURCES += text_renderer/freetype/fonts/darwin.c
-libfreetype_plugin_la_LDFLAGS += -Wl,-framework,CoreFoundation -Wl,-framework,CoreText
+libfreetype_plugin_la_LINK += -Wl,-framework,CoreFoundation -Wl,-framework,CoreText
 endif
 if HAVE_FRIBIDI
 libfreetype_plugin_la_CPPFLAGS += $(FRIBIDI_CFLAGS) -DHAVE_FRIBIDI



More information about the vlc-commits mailing list