[vlc-commits] contrib: vpx: fix broken text reloc
Victorien Le Couviour--Tuffet
git at videolan.org
Tue Oct 23 17:25:09 CEST 2018
vlc/vlc-3.0 | branch: master | Victorien Le Couviour--Tuffet <victorien.lecouviour.tuffet at gmail.com> | Mon Sep 17 23:43:58 2018 +0200| [fdf70f485bdca2cefd47b572166af84257ca0ea4] | committer: Thomas Guillem
contrib: vpx: fix broken text reloc
Fixes android NDK 17 build
(cherry picked from commit 8e2f1a8c8ef6877b25a43612fcd81bfb8646f1f0)
Signed-off-by: Thomas Guillem <thomas at gllm.fr>
> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=fdf70f485bdca2cefd47b572166af84257ca0ea4
---
contrib/src/vpx/rules.mak | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/contrib/src/vpx/rules.mak b/contrib/src/vpx/rules.mak
index c42ce4964e..02a28dd992 100644
--- a/contrib/src/vpx/rules.mak
+++ b/contrib/src/vpx/rules.mak
@@ -135,7 +135,7 @@ ifdef HAVE_ANDROID
# uses that path to look for the compiler (which we already know)
VPX_CONF += --sdk-path=$(shell dirname $(shell which $(HOST)-clang))
# broken text relocations
-ifeq ($(ARCH),x86_64)
+ifneq ($(filter i386 x86_64,$(ARCH)),)
VPX_CONF += --disable-mmx
endif
endif
More information about the vlc-commits
mailing list