[vlc-commits] contrib: vpx: Configure as generic-gnu instead of armv7-win32-gcc

[Martin Storsjö]

vlc/vlc-3.0 | branch: master | Martin Storsjö <martin at martin.st> | Tue Dec 19 13:03:54 2017 +0200| [8325586c3f067e56f94b602a38cd028089c3ad58] | committer: Hugo Beauzée-Luyssen

contrib: vpx: Configure as generic-gnu instead of armv7-win32-gcc

Vpx doesn't support the armv7-win32-gcc target (and adding support
for it is slightly more work than just a trivial patch).

(cherry picked from commit bd34617bcb88679cce56ad97d785e381a503f8c4)
Signed-off-by: Hugo Beauzée-Luyssen <hugo at beauzee.fr>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=8325586c3f067e56f94b602a38cd028089c3ad58
---

 contrib/src/vpx/rules.mak | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/contrib/src/vpx/rules.mak b/contrib/src/vpx/rules.mak
index 02a28dd992..05e759c3c4 100644
--- a/contrib/src/vpx/rules.mak
+++ b/contrib/src/vpx/rules.mak
@@ -39,7 +39,8 @@ VPX_ARCH := armv7s
 else
 VPX_ARCH := armv7
 endif
-else
+else ifndef HAVE_WIN32
+# libvpx doesn't support win32/arm with clang yet
 VPX_ARCH := armv7
 endif
 else ifeq ($(ARCH),i386)