[vlc-commits] contrib/x264: fix cross-compilation for aarch64 on macOS

[Felix Paul Kühne]

vlc | branch: master | Felix Paul Kühne <felix at feepk.net> | Sun Nov 29 20:12:39 2020 +0100| [9dec73bf626928375762e1bfb8e6f4311de590ea] | committer: Felix Paul Kühne

contrib/x264: fix cross-compilation for aarch64 on macOS

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

 contrib/src/x264/rules.mak | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/contrib/src/x264/rules.mak b/contrib/src/x264/rules.mak
index d69f7508c5..26a8cc2fe6 100644
--- a/contrib/src/x264/rules.mak
+++ b/contrib/src/x264/rules.mak
@@ -45,7 +45,9 @@ X264_AS = AS="$(CC)"
 endif
 endif
 ifdef HAVE_CROSS_COMPILE
+ifndef HAVE_DARWIN_OS
 X264CONF += --cross-prefix="$(HOST)-"
+endif
 ifdef HAVE_ANDROID
 # broken text relocations
 ifeq ($(ANDROID_ABI), x86)
@@ -56,6 +58,11 @@ X264CONF += --disable-asm
 endif
 endif
 endif
+ifdef HAVE_DARWIN_OS
+ifeq ($(ARCH),aarch64)
+X264CONF += --extra-asflags="-arch $(PLATFORM_SHORT_ARCH)"
+endif
+endif
 
 $(TARBALLS)/x264-git.tar.xz:
 	$(call download_git,$(X264_GITURL))