[vlc-commits] bin: correctly link without objc compiler

Jean-Baptiste Kempf git at videolan.org
Sat Feb 18 03:42:21 CET 2017


vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Sat Feb 18 03:41:14 2017 +0100| [1aca4b04eae18e69cbe2c620d6636aa75fa95852] | committer: Jean-Baptiste Kempf

bin: correctly link without objc compiler

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=1aca4b04eae18e69cbe2c620d6636aa75fa95852
---

 bin/Makefile.am | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/bin/Makefile.am b/bin/Makefile.am
index 2faf646..1478d7f 100644
--- a/bin/Makefile.am
+++ b/bin/Makefile.am
@@ -39,10 +39,12 @@ vlc_LDFLAGS = $(LDFLAGS_vlc)
 vlc_LDADD = ../lib/libvlc.la $(LIBPTHREAD)
 
 if HAVE_DARWIN
-vlc_LDFLAGS += -Wl,-framework,CoreFoundation,-framework,Cocoa
+vlc_LINK = $(OBJCLINK) -Wl,-framework,Cocoa
 if HAVE_BREAKPAD
-vlc_LDFLAGS += -Wl,-framework,Breakpad
+vlc_LINK += -Wl,-framework,Breakpa
 endif
+else
+vlc_LINK = $(LINK)
 endif
 
 vlc_static_SOURCES = $(vlc_SOURCES)
@@ -53,10 +55,10 @@ vlc_static_CFLAGS = $(AM_CFLAGS) \
 vlc_static_DEPENDENCIES = $(vlc_DEPENDENCIES)
 vlc_static_LDADD = $(vlc_LDADD)
 vlc_static_LDFLAGS = $(vlc_LDFLAGS)
+vlc_static_LINK = $(vlc_LINK)
 
 if HAVE_DARWIN
 vlc_static_OBJCFLAGS = $(AM_OBJCFLAGS) $(vlc_static_CFLAGS) $(vlc_OBJCFLAGS)
-vlc_static_LDFLAGS += -static
 endif
 
 if HAVE_WIN32



More information about the vlc-commits mailing list