contrib: gnutls: Disable assembly on windows/x86_64 and aarch64 when built with clang
authorMartin Storsjö <martin@martin.st>
Wed, 13 Dec 2017 14:11:09 +0000 (16:11 +0200)
committerMartin Storsjö <martin@martin.st>
Sun, 25 Feb 2018 20:47:13 +0000 (22:47 +0200)
Move the check for clang from the qt rules.mak into the toplevel
main.mak.

This fixes building in these configurations.

contrib/src/gnutls/rules.mak
contrib/src/main.mak
contrib/src/qt/rules.mak

index 9cd29be..95caf68 100644 (file)
@@ -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)
index e6da70c..cc9425e 100644 (file)
@@ -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
index 8e69cad..a034db2 100644 (file)
@@ -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