[vlc-commits] contrib: qt: fix native win32 build with clang

Steve Lhomme git at videolan.org
Tue Apr 30 09:55:47 CEST 2019


vlc | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Thu Apr 25 10:23:17 2019 +0200| [38bec2db15e64634a216bcdc5fa20c7d6ebadd7e] | committer: Steve Lhomme

contrib: qt: fix native win32 build with clang

We want to use the proper compiler prefix so we need the CROSS_COMPILE=$(HOST)
part otherwise Qt uses the plain clang++.exe.

We also force the -platform so it compiles native code with clang++.exe, it
refuses to compile if we don't set it.

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

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

diff --git a/contrib/src/qt/rules.mak b/contrib/src/qt/rules.mak
index f0dd9bf084..88cf9ea042 100644
--- a/contrib/src/qt/rules.mak
+++ b/contrib/src/qt/rules.mak
@@ -73,7 +73,9 @@ endif
 ifdef HAVE_CROSS_COMPILE
 QT_PLATFORM := -xplatform $(QT_SPEC) -device-option CROSS_COMPILE=$(HOST)-
 else
-ifneq ($(QT_SPEC),)
+ifdef HAVE_CLANG
+QT_PLATFORM := -xplatform $(QT_SPEC) -device-option CROSS_COMPILE=$(HOST)- -platform $(QT_SPEC)
+else
 QT_PLATFORM := -platform $(QT_SPEC)
 endif
 endif



More information about the vlc-commits mailing list