[vlc-devel] [PATCH 3/7 v2] contrib/bootstrap: Fix case order for arm64 check for darwin

[Marvin Scholz]

On 5 Jun 2019, at 17:01, Rémi Denis-Courmont wrote:

> That sort of automatically detectable stuff is supposed to be in the 
> Makefiles, like e.g. get-arch.sh
>

I agree, although untangling this is quite complex and I can't do it 
right now,
without maybe breaking Android or some linux cross-builds as I am unsure 
what
-arch argument the compiler expects there.

I just wanted to fix the obviously wrong order for now.

> Le 5 juin 2019 17:15:49 GMT+03:00, Marvin Scholz <epirat07 at gmail.com> 
> a écrit :
>> If the *arm* case come before the arm64 case, it would always match 
>> the
>> arm case instead of the arm64 one.
>> ---
>> contrib/bootstrap | 6 +++---
>> 1 file changed, 3 insertions(+), 3 deletions(-)
>>
>> diff --git a/contrib/bootstrap b/contrib/bootstrap
>> index f1c6a75be6..2bd9b9c9bf 100755
>> --- a/contrib/bootstrap
>> +++ b/contrib/bootstrap
>> @@ -296,13 +296,13 @@ case "${OS}" in
>> 					add_make "PLATFORM_SHORT_ARCH := armv7s"
>> 					add_make_enabled "HAVE_NEON" "HAVE_ARMV7A"
>> 					;;
>> +				*arm64*|*aarch64*)
>> +					add_make "PLATFORM_SHORT_ARCH := arm64"
>> +					;;
>> 				*arm*)
>> 					add_make "PLATFORM_SHORT_ARCH := armv7"
>> 					add_make_enabled "HAVE_NEON" "HAVE_ARMV7A"
>> 					;;
>> -				*arm64*|*aarch64*)
>> -					add_make "PLATFORM_SHORT_ARCH := arm64"
>> -					;;
>> 				*x86_64*)
>> 					add_make "PLATFORM_SHORT_ARCH := x86_64"
>> 					;;
>> -- 
>> 2.20.1 (Apple Git-117)
>>
>> _______________________________________________
>> vlc-devel mailing list
>> To unsubscribe or modify your subscription options:
>> https://mailman.videolan.org/listinfo/vlc-devel
>
> -- 
> Envoyé de mon appareil Android avec Courriel K-9 Mail. Veuillez 
> excuser ma brièveté._______________________________________________
> vlc-devel mailing list
> To unsubscribe or modify your subscription options:
> https://mailman.videolan.org/listinfo/vlc-devel