[vlc-commits] contrib/vpx: fix compilation for AArch64 with the updated iOS build script

[Felix Paul Kühne]

vlc | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Mon Dec  8 23:50:32 2014 +0100| [5bde7a829460eb1accaad8f28ec43d0b179ce131] | committer: Felix Paul Kühne

contrib/vpx: fix compilation for AArch64 with the updated iOS build script

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=5bde7a829460eb1accaad8f28ec43d0b179ce131
---

 contrib/src/vpx/rules.mak |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/contrib/src/vpx/rules.mak b/contrib/src/vpx/rules.mak
index b55199d..2ce0ad1 100644
--- a/contrib/src/vpx/rules.mak
+++ b/contrib/src/vpx/rules.mak
@@ -91,7 +91,12 @@ VPX_CONF += --sdk-path=$(MACOSX_SDK)
 endif
 ifdef HAVE_IOS
 VPX_CONF += --sdk-path=$(IOS_SDK) --enable-vp8-decoder --disable-vp8-encoder --disable-vp9-encoder
-VPX_LDFLAGS := -L$(IOS_SDK)/usr/lib -arch $(ARCH) -syslibroot $(IOS_SDK) -ios_version_min 6.1
+VPX_LDFLAGS := -L$(IOS_SDK)/usr/lib -syslibroot $(IOS_SDK) -ios_version_min 6.1
+ifeq ($(ARCH),aarch64)
+VPX_LDFLAGS += -arch arm64
+else
+VPX_LDFLAGS += -arch $(ARCH)
+endif
 endif
 ifdef HAVE_ANDROID
 # vpx configure.sh overrides our sysroot and it looks for it itself, and