[vlc-devel] [PATCH 3.0 10/16] contrib: x264: Fix building for aarch64/windows after the recent x264 update

[Martin Storsjö]

The current version of x264 defaults to using gas-preprocessor and
arasm64 for this target. Override it to use plain $(CC) instead.

(cherry picked from commit 31c65810c27b492316e7a32925e599f5bea9db31)
---
 contrib/src/x264/rules.mak | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/contrib/src/x264/rules.mak b/contrib/src/x264/rules.mak
index da1e935829..76dbe3440d 100644
--- a/contrib/src/x264/rules.mak
+++ b/contrib/src/x264/rules.mak
@@ -38,6 +38,11 @@ X264CONF += --enable-win32thread
 ifeq ($(ARCH), arm)
 X264_AS = AS="./tools/gas-preprocessor.pl -arch arm -as-type clang -force-thumb -- $(CC) -mimplicit-it=always"
 endif
+ifeq ($(ARCH),aarch64)
+# Configure defaults to gas-preprocessor + armasm64 for this target,
+# unless overridden.
+X264_AS = AS="$(CC)"
+endif
 endif
 ifdef HAVE_CROSS_COMPILE
 X264CONF += --cross-prefix="$(HOST)-"
-- 
2.17.1