[vlc-commits] contrib: gnutls: Disable assembly on windows/x86_64 and aarch64 when built with clang

[Martin Storsjö]

vlc/vlc-3.0 | branch: master | Martin Storsjö <martin at martin.st> | Wed Dec 13 16:11:09 2017 +0200| [ab2ac694d16cc557e7973e917af5e7677d1bb4d7] | committer: Hugo Beauzée-Luyssen

contrib: gnutls: Disable assembly on windows/x86_64 and aarch64 when built with clang

Move the check for clang from the qt rules.mak into the toplevel
main.mak.

This fixes building in these configurations.

(cherry picked from commit bc61a1e6cc1a4e2828997619faaea8cae7a28cd1)
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=ab2ac694d16cc557e7973e917af5e7677d1bb4d7
---

 contrib/src/gnutls/rules.mak | 7 +++++++
 contrib/src/main.mak         | 3 +++
 contrib/src/qt/rules.mak     | 6 +++++-
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/contrib/src/gnutls/rules.mak b/contrib/src/gnutls/rules.mak
index c8454d4d13..71e68bf0a8 100644
--- a/contrib/src/gnutls/rules.mak
+++ b/contrib/src/gnutls/rules.mak
@@ -74,6 +74,13 @@ ifeq ($(ARCH),x86_64)
 	GNUTLS_CONF += --disable-hardware-acceleration
 endif
 endif
+ifdef HAVE_WIN32
+ifdef HAVE_CLANG
+ifneq ($(findstring $(ARCH), x86_64 aarch64),)
+	GNUTLS_CONF += --disable-hardware-acceleration
+endif
+endif
+endif
 
 .gnutls: gnutls
 	$(RECONF)
diff --git a/contrib/src/main.mak b/contrib/src/main.mak
index 6c3b02d0d6..805b7db90b 100644
--- a/contrib/src/main.mak
+++ b/contrib/src/main.mak
@@ -140,6 +140,9 @@ ifdef HAVE_WIN32
 ifneq ($(shell $(CC) $(CFLAGS) -E -dM -include _mingw.h - < /dev/null | grep -E __MINGW64_VERSION_MAJOR),)
 HAVE_MINGW_W64 := 1
 endif
+ifneq ($(findstring clang, $(shell $(CC) --version)),)
+HAVE_CLANG := 1
+endif
 endif
 
 ifdef HAVE_SOLARIS
diff --git a/contrib/src/qt/rules.mak b/contrib/src/qt/rules.mak
index 347c41bdad..2e838f9f18 100644
--- a/contrib/src/qt/rules.mak
+++ b/contrib/src/qt/rules.mak
@@ -32,8 +32,12 @@ ifdef HAVE_MACOSX
 QT_PLATFORM := -platform darwin-g++
 endif
 ifdef HAVE_WIN32
+ifdef HAVE_CLANG
+QT_SPEC := win32-clang-g++
+else
 QT_SPEC := win32-g++
-QT_PLATFORM := -xplatform win32-g++ -device-option CROSS_COMPILE=$(HOST)-
+endif
+QT_PLATFORM := -xplatform $(QT_SPEC) -device-option CROSS_COMPILE=$(HOST)-
 endif
 
 QT_CONFIG := -static -opensource -confirm-license -no-pkg-config \