[vlc-commits] contrib: qt: Use the right cross 'ar' tool when cross-building the tools executables

[Martin Storsjö]

vlc/vlc-3.0 | branch: master | Martin Storsjö <martin at martin.st> | Thu Dec 28 22:58:29 2017 +0200| [8279196c29c9665dc1fa36410dc7fb93b2cdccff] | committer: Jean-Baptiste Kempf

contrib: qt: Use the right cross 'ar' tool when cross-building the tools executables

This fixes cross compiling the tools for non-x86 mingw using llvm
based tools.

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
(cherry picked from commit 7dcb5d368854eb247dd7e8683f5d4f0a85570869)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

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

 contrib/src/qt/rules.mak | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contrib/src/qt/rules.mak b/contrib/src/qt/rules.mak
index 8f7c3ab46d..3bc0fce4b8 100644
--- a/contrib/src/qt/rules.mak
+++ b/contrib/src/qt/rules.mak
@@ -72,7 +72,7 @@ ifdef HAVE_CROSS_COMPILE
 	cd $<; $(MAKE) install_qmake install_mkspecs
 	cd $</src/tools; \
 	for i in bootstrap uic rcc moc; \
-		do (cd $$i; echo $$i && ../../../bin/qmake -spec $(QT_SPEC) && $(MAKE) clean && $(MAKE) CC=$(HOST)-gcc CXX=$(HOST)-g++ LINKER=$(HOST)-g++ && $(MAKE) install); \
+		do (cd $$i; echo $$i && ../../../bin/qmake -spec $(QT_SPEC) && $(MAKE) clean && $(MAKE) CC=$(HOST)-gcc CXX=$(HOST)-g++ LINKER=$(HOST)-g++ LIB="$(HOST)-ar -rc" && $(MAKE) install); \
 	done
 endif
 	touch $@