[vlc-commits] contrib: ebml: remove forced exception handling

Steve Lhomme git at videolan.org
Tue Jul 7 09:10:31 CEST 2020


vlc/vlc-3.0 | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Mon Jul  6 07:50:49 2020 +0200| [4d4fca4bf07cfe286a4fce470f15bfc078d89703] | committer: Steve Lhomme

contrib: ebml: remove forced exception handling

Introduced in 2012 for x86 Android builds. It should be enabled directly by
CMake when building on modern systems.

libmatroska also throws some exception and was always compiled without this flag.

(cherry picked from commit 107a97cee9fa97d186fcab504b7c1c6c3977ffaa)

Signed-off-by: Steve Lhomme <robux4 at ycbcr.xyz>

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

 contrib/src/ebml/rules.mak | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/contrib/src/ebml/rules.mak b/contrib/src/ebml/rules.mak
index af93ec24af..3aecd88c38 100644
--- a/contrib/src/ebml/rules.mak
+++ b/contrib/src/ebml/rules.mak
@@ -16,10 +16,7 @@ ebml: libebml-$(EBML_VERSION).tar.xz .sum-ebml
 	$(UNPACK)
 	$(MOVE)
 
-# libebml requires exceptions
-EBML_CXXFLAGS := $(CXXFLAGS) $(PIC) -fexceptions
-
 .ebml: ebml toolchain.cmake
-	cd $< && $(HOSTVARS_PIC) CXXFLAGS="$(EBML_CXXFLAGS)" $(CMAKE) -DENABLE_WIN32_IO=OFF
+	cd $< && $(HOSTVARS_PIC) $(CMAKE) -DENABLE_WIN32_IO=OFF
 	cd $< && $(MAKE) install
 	touch $@



More information about the vlc-commits mailing list