Commit bc61a1e6 authored by Martin Storsjö's avatar 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.
parent e8fe4c67
......@@ -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)
......
......@@ -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
......
......@@ -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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment