[vlc-commits] contrib: qt: Use the win32-clang-g++ mkspec when building with for windows with clang

[Martin Storsjö]

vlc | branch: master | Martin Storsjö <martin at martin.st> | Wed Feb 21 13:26:31 2018 +0200| [e8fe4c67d68a79100db8776cdaa84d35299b7e6e] | committer: Martin Storsjö

contrib: qt: Use the win32-clang-g++ mkspec when building with for windows with clang

Check $(CC) --version to see if it turns out to be clang.

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

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

diff --git a/contrib/src/qt/rules.mak b/contrib/src/qt/rules.mak
index 13b1545e51..8e69cad7ce 100644
--- a/contrib/src/qt/rules.mak
+++ b/contrib/src/qt/rules.mak
@@ -38,8 +38,12 @@ ifdef HAVE_MACOSX
 QT_PLATFORM := -platform darwin-g++
 endif
 ifdef HAVE_WIN32
+ifeq ($(findstring clang, $(shell $(CC) --version)),)
 QT_SPEC := win32-g++
-QT_PLATFORM := -xplatform win32-g++ -device-option CROSS_COMPILE=$(HOST)-
+else
+QT_SPEC := win32-clang-g++
+endif
+QT_PLATFORM := -xplatform $(QT_SPEC) -device-option CROSS_COMPILE=$(HOST)-
 endif
 
 QT_CONFIG := -static -opensource -confirm-license -no-pkg-config \