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

[Martin Storsjö]

vlc | branch: master | Martin Storsjö <martin at martin.st> | Wed Dec 13 16:11:09 2017 +0200| [bc61a1e6cc1a4e2828997619faaea8cae7a28cd1] | committer: Martin Storsjö

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.

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

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

diff --git a/contrib/src/gnutls/rules.mak b/contrib/src/gnutls/rules.mak
index 9cd29beead..95caf6885f 100644
--- a/contrib/src/gnutls/rules.mak
+++ b/contrib/src/gnutls/rules.mak
@@ -75,6 +75,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 e6da70cc27..cc9425e43e 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 8e69cad7ce..a034db2cbc 100644
--- a/contrib/src/qt/rules.mak
+++ b/contrib/src/qt/rules.mak
@@ -38,10 +38,10 @@ ifdef HAVE_MACOSX
 QT_PLATFORM := -platform darwin-g++
 endif
 ifdef HAVE_WIN32
-ifeq ($(findstring clang, $(shell $(CC) --version)),)
-QT_SPEC := win32-g++
-else
+ifdef HAVE_CLANG
 QT_SPEC := win32-clang-g++
+else
+QT_SPEC := win32-g++
 endif
 QT_PLATFORM := -xplatform $(QT_SPEC) -device-option CROSS_COMPILE=$(HOST)-
 endif