[vlc-commits] contrib: Remove duplicated flags in CMake toolchain file

[Marvin Scholz]

vlc/vlc-3.0 | branch: master | Marvin Scholz <epirat07 at gmail.com> | Wed Jun 19 11:34:48 2019 +0200| [b2d74a37fcb73e8321159b2f30149cd803e8881a] | committer: Steve Lhomme

contrib: Remove duplicated flags in CMake toolchain file

The EXTRA_* flags are already added to CFLAGS and CXXFLAGS before,
so adding them again here would cause duplicated flags.

(cherry picked from commit bddf26b2d32a04d887925376d00d5919cd351901)
Signed-off-by: Steve Lhomme <robux4 at ycbcr.xyz>

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

 contrib/src/main.mak | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/contrib/src/main.mak b/contrib/src/main.mak
index f570a733a3..37a1f8905d 100644
--- a/contrib/src/main.mak
+++ b/contrib/src/main.mak
@@ -548,8 +548,8 @@ ifdef HAVE_CROSS_COMPILE
 endif
 endif
 ifdef HAVE_DARWIN_OS
-	echo "set(CMAKE_C_FLAGS \"$(CFLAGS) $(EXTRA_CFLAGS)\")" >> $@
-	echo "set(CMAKE_CXX_FLAGS \"$(CXXFLAGS) $(EXTRA_CXXFLAGS)\")" >> $@
+	echo "set(CMAKE_C_FLAGS \"$(CFLAGS)\")" >> $@
+	echo "set(CMAKE_CXX_FLAGS \"$(CXXFLAGS)\")" >> $@
 	echo "set(CMAKE_LD_FLAGS \"$(LDFLAGS)\")" >> $@
 	echo "set(CMAKE_AR ar CACHE FILEPATH "Archiver")" >> $@
 ifdef HAVE_IOS