vlc | branch: master | Steve Lhomme <rob...@ycbcr.xyz> | Thu May 17 12:34:47 
2018 +0200| [69bc7c3539ca430dfafc80d53e00dab7ec2208a2] | committer: Steve Lhomme

contrib: ebml: fix passing flags to to compiler

Given it wasn't use maybe it's not needed anymore with the switch to cmake.

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

 contrib/src/ebml/rules.mak | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/contrib/src/ebml/rules.mak b/contrib/src/ebml/rules.mak
index 4113668d84..9d399fc042 100644
--- a/contrib/src/ebml/rules.mak
+++ b/contrib/src/ebml/rules.mak
@@ -19,12 +19,9 @@ ebml: libebml-$(EBML_VERSION).tar.xz .sum-ebml
        $(MOVE)
 
 # libebml requires exceptions
-EBML_EXTRA_FLAGS = CXXFLAGS="${CXXFLAGS} -fexceptions -fvisibility=hidden"
-ifdef HAVE_ANDROID
-EBML_EXTRA_FLAGS += CPPFLAGS=""
-endif
+EBML_CXXFLAGS := $(CXXFLAGS) -fexceptions -fvisibility=hidden
 
 .ebml: ebml toolchain.cmake
-       cd $< && $(HOSTVARS_PIC) $(CMAKE) -DBUILD_SHARED_LIBS=OFF
+       cd $< && $(HOSTVARS_PIC) CXXFLAGS="$(EBML_CXXFLAGS)" $(CMAKE) 
-DBUILD_SHARED_LIBS=OFF
        cd $< && $(MAKE) install
        touch $@

_______________________________________________
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

Reply via email to