contrib: ebml: fix passing flags to to compiler
authorSteve Lhomme <robux4@ycbcr.xyz>
Thu, 17 May 2018 10:34:47 +0000 (12:34 +0200)
committerSteve Lhomme <robux4@ycbcr.xyz>
Thu, 17 May 2018 11:00:45 +0000 (13:00 +0200)
Given it wasn't use maybe it's not needed anymore with the switch to cmake.

contrib/src/ebml/rules.mak

index 4113668..9d399fc 100644 (file)
@@ -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 $@