[vlc-commits] contrib: matroska: remove the -O2 forcing

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


vlc/vlc-3.0 | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Mon Jul  6 11:40:06 2020 +0200| [427a5188f35fc934d777b3af531ced253b494d83] | committer: Steve Lhomme

contrib: matroska: remove the -O2 forcing

Fixed since c764461180d70d1c9fa81e72cd7ad9d9b289eea6

(cherry picked from commit 3cdbeb2cb46bc6b11e562749745232774496d09a) (edited)

edited:
- in this branch the -O2 forcing was only done for iOS

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

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

 contrib/src/matroska/rules.mak | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/contrib/src/matroska/rules.mak b/contrib/src/matroska/rules.mak
index 0091c7e53b..c455d2f912 100644
--- a/contrib/src/matroska/rules.mak
+++ b/contrib/src/matroska/rules.mak
@@ -21,12 +21,7 @@ matroska: libmatroska-$(MATROSKA_VERSION).tar.xz .sum-matroska
 	$(call pkg_static,"libmatroska.pc.in")
 	$(MOVE)
 
-# O2 optimization due to iOS issue https://code.videolan.org/videolan/vlc-ios/issues/248
-ifdef HAVE_IOS
-MATROSKA_CXXFLAGS +=  -O2
-endif
-
 .matroska: matroska toolchain.cmake
-	cd $< && $(HOSTVARS_PIC) CXXFLAGS="$(MATROSKA_CXXFLAGS)" $(CMAKE)
+	cd $< && $(HOSTVARS_PIC) $(CMAKE)
 	cd $< && $(MAKE) install
 	touch $@



More information about the vlc-commits mailing list