[vlc-commits] contrib: qtsvg: fix qmake call when cross compiling

Steve Lhomme git at videolan.org
Fri Jun 29 17:57:36 CEST 2018


vlc | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Tue Jun 19 12:38:12 2018 +0200| [381304e202b8b21f2ae8b81e5108288d6dd75925] | committer: Steve Lhomme

contrib: qtsvg: fix qmake call when cross compiling

It's only installed when cross compiling

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=381304e202b8b21f2ae8b81e5108288d6dd75925
---

 contrib/src/qtsvg/rules.mak | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/contrib/src/qtsvg/rules.mak b/contrib/src/qtsvg/rules.mak
index 9784b51ffd..d82c727be0 100644
--- a/contrib/src/qtsvg/rules.mak
+++ b/contrib/src/qtsvg/rules.mak
@@ -25,7 +25,11 @@ qtsvg: qtsvg-$(QTSVG_VERSION).tar.xz .sum-qtsvg
 	$(MOVE)
 
 .qtsvg: qtsvg
+ifdef HAVE_CROSS_COMPILE
 	cd $< && $(PREFIX)/bin/qmake
+else
+	cd $< && ../qt/bin/qmake
+endif
 	# Make && Install libraries
 	cd $< && $(MAKE)
 	cd $< && $(MAKE) -C src sub-plugins-install_subtargets sub-svg-install_subtargets



More information about the vlc-commits mailing list