[vlc-commits] contrib: vpx: iOS: Handle aarch64 as arm64 for VPX_OS

[Soomin Lee]

vlc/vlc-3.0 | branch: master | Soomin Lee <bubu at mikan.io> | Wed Dec  5 09:53:40 2018 +0100| [218028bb7fe6c7dc44f9299a5fd538095bf7eea1] | committer: Hugo Beauzée-Luyssen

contrib: vpx: iOS: Handle aarch64 as arm64 for VPX_OS

As stated in the libvpx README[1], for aarch64, darwin11 doesn't exist and leads to:

 `Unrecognized toolchain 'arm64-darwin11-gcc'`

See failure on jenkins[2].

[1]: https://github.com/webmproject/libvpx/blob/master/README
[2]: https://jenkins.videolan.org/job/VLCKit/job/vlc-nightly-iOS-MobileVLCKit/900/consoleFull

Signed-off-by: Hugo Beauzée-Luyssen <hugo at beauzee.fr>
(cherry picked from commit 9bc4318cbf22c7c33295fe24ab863992f5c7ad27)
Signed-off-by: Hugo Beauzée-Luyssen <hugo at beauzee.fr>

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

 contrib/src/vpx/rules.mak | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contrib/src/vpx/rules.mak b/contrib/src/vpx/rules.mak
index ae2f0ee77c..d3345c67e7 100644
--- a/contrib/src/vpx/rules.mak
+++ b/contrib/src/vpx/rules.mak
@@ -76,7 +76,7 @@ VPX_OS := darwin10
 endif
 VPX_CROSS :=
 else ifdef HAVE_IOS
-ifeq ($(ARCH),arm)
+ifeq ($(ARCH),$(filter $(ARCH), arm aarch64))
 VPX_OS := darwin
 else
 VPX_OS := darwin11