[vlc-devel] [PATCH 2/2] contrib: Remove duplicated flags in CMake toolchain file

[Steve Lhomme]

LGTM. Although, as you said, it's odd that it's only for Darwin. On all 
other envrionment it seems the CFLAGS are handled properly.

Does it not work if you remove those lines ?

On 2019-06-19 11:34, Marvin Scholz wrote:
> 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
> 
> _______________________________________________
> vlc-devel mailing list
> To unsubscribe or modify your subscription options:
> https://mailman.videolan.org/listinfo/vlc-devel
>