From b5e0b7f1b939955c3a8be4293d5cbe7448629463 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Fri, 20 Mar 2015 10:40:30 +0100
Subject: [PATCH] x264: unbreak cross compilation on armv[67] (close #1166).

---
 srcpkgs/x264/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/x264/template b/srcpkgs/x264/template
index 21431904aa6..479a4921508 100644
--- a/srcpkgs/x264/template
+++ b/srcpkgs/x264/template
@@ -14,8 +14,10 @@ distfiles="http://download.videolan.org/pub/videolan/x264/snapshots/x264-snapsho
 checksum=3519e8fa3399845c7d2248d0a7297a923ac6bdc78d0ec15e85026e810670e1be
 
 do_configure() {
-	if [ "$XBPS_TARGET_MACHINE" = "armv6hf" ]; then
+	if [ "$XBPS_TARGET_MACHINE" = "armv6l" ]; then
 		args+=" --disable-asm"
+	elif [ "$XBPS_TARGET_MACHINE" = "armv7l" ]; then
+		export AS=$CC
 	fi
 	if [ "$CROSS_BUILD" ]; then
 		args+=" --host=$XBPS_CROSS_TRIPLET"
@@ -27,7 +29,6 @@ do_configure() {
 do_build() {
 	make ${makejobs}
 }
-
 do_install() {
 	make DESTDIR=${DESTDIR} \
 		bindir=/usr/bin libdir=/usr/lib includedir=/usr/include install