]> git.sesse.net Git - vlc/commitdiff
contrib/vpx: fix compilation for AArch64 with the updated iOS build script
authorFelix Paul Kühne <fkuehne@videolan.org>
Mon, 8 Dec 2014 22:50:32 +0000 (23:50 +0100)
committerFelix Paul Kühne <fkuehne@videolan.org>
Mon, 8 Dec 2014 22:51:37 +0000 (23:51 +0100)
contrib/src/vpx/rules.mak

index b55199dc99d3d9bea79a8cb5f2542e132acba1e9..2ce0ad13a87f600566386c107ad054b5505ac77d 100644 (file)
@@ -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