[vlc-commits] contrib: fix cross-compile for aarch64

[Thomas Guillem]

vlc | branch: master | Thomas Guillem <tom at gllm.fr> | Thu Oct  9 18:45:23 2014 +0200| [e3aa96b9fe8660952cfe83986c5dde0bd3f1e267] | committer: Rémi Denis-Courmont

contrib: fix cross-compile for aarch64

Signed-off-by: Rémi Denis-Courmont <remi at remlab.net>

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

 contrib/src/ffmpeg/rules.mak   |    7 +++++++
 contrib/src/postproc/rules.mak |    5 +++++
 2 files changed, 12 insertions(+)

diff --git a/contrib/src/ffmpeg/rules.mak b/contrib/src/ffmpeg/rules.mak
index 9ddcd83..f4b4430 100644
--- a/contrib/src/ffmpeg/rules.mak
+++ b/contrib/src/ffmpeg/rules.mak
@@ -81,6 +81,13 @@ FFMPEGCONF += --cpu=armv6 --disable-neon
 endif
 endif
 
+# ARM64 stuff
+ifeq ($(ARCH),aarch64)
+ifndef HAVE_DARWIN_OS
+FFMPEGCONF += --arch=aarch64
+endif
+endif
+
 # MIPS stuff
 ifeq ($(ARCH),mipsel)
 FFMPEGCONF += --arch=mips
diff --git a/contrib/src/postproc/rules.mak b/contrib/src/postproc/rules.mak
index 27e0b74..42ec148 100644
--- a/contrib/src/postproc/rules.mak
+++ b/contrib/src/postproc/rules.mak
@@ -35,6 +35,11 @@ POSTPROCCONF += --enable-neon
 endif
 endif
 
+# ARM64 stuff
+ifeq ($(ARCH),aarch64)
+POSTPROCCONF += --arch=aarch64
+endif
+
 # MIPS stuff
 ifeq ($(ARCH),mipsel)
 POSTPROCCONF += --arch=mips