libx264: fix build on soft-float targets

--disable-asm isn't enough to disable building assembly code on ARM. Signed-off-by: Daniel Golle <daniel@makrotopia.org>
2016-09-23 00:23:24 +02:00 · 2016-09-23 00:23:24 +02:00 · ab010288da
parent 64c6b8b735
commit ab010288da
1 changed files with 6 additions and 4 deletions
--- a/libs/libx264/Makefile
+++ b/libs/libx264/Makefile
@ -38,15 +38,17 @@ else
 endif
 endif

+ifneq ($(CONFIG_SOFT_FLOAT),)
+CONFIGURE_VARS+= AS= 
+MAKE_FLAGS+= AS= 
+CONFIGURE_ARGS += --disable-asm
+endif
+
 CONFIGURE_ARGS += \
 		--enable-shared \
 		--enable-pic \
 		--disable-cli 

-ifeq ($(CONFIG_SOFT_FLOAT),y)
-CONFIGURE_ARGS += --disable-asm
-endif
-
 define Package/libx264
  SECTION:=libs
  CATEGORY:=Libraries