[vlc-devel] [PATCH 2/2] contrib: Remove duplicated flags in CMake toolchain file
Marvin Scholz
epirat07 at gmail.com
Wed Jun 19 11:34:48 CEST 2019
The EXTRA_* flags are already added to CFLAGS and CXXFLAGS before,
so adding them again here would cause duplicated flags.
---
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 eb9e3f55a4..2062f5f5c2 100644
--- a/contrib/src/main.mak
+++ b/contrib/src/main.mak
@@ -549,8 +549,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
--
2.19.1
More information about the vlc-devel
mailing list