[vlc-devel] [PATCH 1/2] contrib: Correctly set CMAKE_CXX_FLAGS to CXXFLAGS

[Marvin Scholz]

On 19 Jun 2019, at 12:12, Steve Lhomme wrote:

> You only need [2/2] since this one is removed anyway.
>

I am not removing CXXFLAGS, only the EXTRA ones which were always
correct anyway.
The second patch is based on this one and just does the EXTRA_*
removal.

> On 2019-06-19 11:34, Marvin Scholz wrote:
>> ---
>>   contrib/src/main.mak | 2 +-
>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/contrib/src/main.mak b/contrib/src/main.mak
>> index 4aa9c2c3b8..eb9e3f55a4 100644
>> --- a/contrib/src/main.mak
>> +++ b/contrib/src/main.mak
>> @@ -550,7 +550,7 @@ endif
>>   endif
>>   ifdef HAVE_DARWIN_OS
>>   	echo "set(CMAKE_C_FLAGS \"$(CFLAGS) $(EXTRA_CFLAGS)\")" >> $@
>> -	echo "set(CMAKE_CXX_FLAGS \"$(CFLAGS) $(EXTRA_CXXFLAGS)\")" >> $@
>> +	echo "set(CMAKE_CXX_FLAGS \"$(CXXFLAGS) $(EXTRA_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
>>
> _______________________________________________
> vlc-devel mailing list
> To unsubscribe or modify your subscription options:
> https://mailman.videolan.org/listinfo/vlc-devel