From 4fe6972938045bd2e46058e4d961fb4216070eb6 Mon Sep 17 00:00:00 2001 From: Patrick Lodder Date: Fri, 3 Feb 2023 00:55:24 +0100 Subject: [PATCH] build: constrain -lQt5PlatformSupport check as AVX2 dependency This allows windows binaries to be built with AVX2 but without gui --- configure.ac | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index f0ed7c7ce..bd80f4b2d 100644 --- a/configure.ac +++ b/configure.ac @@ -864,7 +864,6 @@ if test x$intel_avx2 = xyes; then AC_CHECK_LIB([IPSec_MB],[sha1_one_block_avx2],LIBS=-lIPSec_MB, AC_MSG_ERROR(IPSec_MB missing)) AC_CHECK_LIB([IPSec_MB],[sha256_one_block_avx2],LIBS=-lIPSec_MB, AC_MSG_ERROR(IPSec_MB missing)) AC_CHECK_LIB([IPSec_MB],[sha512_one_block_avx2],LIBS=-lIPSec_MB, AC_MSG_ERROR(IPSec_MB missing)) - AC_CHECK_LIB([Qt5PlatformSupport],[main],LIBS+=" -lQt5PlatformSupport", AC_MSG_ERROR(lib missing)) AC_CHECK_LIB([mingwthrd], [main],LIBS+=" -lmingwthrd", AC_MSG_ERROR(lib missing)) AC_CHECK_LIB([kernel32], [main],LIBS+=" -lkernel32", AC_MSG_ERROR(lib missing)) AC_CHECK_LIB([user32], [main],LIBS+=" -luser32", AC_MSG_ERROR(lib missing)) @@ -885,6 +884,12 @@ if test x$intel_avx2 = xyes; then AC_CHECK_LIB([iphlpapi], [main],LIBS+=" -liphlpapi", AC_MSG_ERROR(lib missing)) AC_CHECK_LIB([crypt32], [main],LIBS+=" -lcrypt32", AC_MSG_ERROR(lib missing)) AC_CHECK_LIB([ssp], [main],LIBS+=" -lssp", AC_MSG_ERROR(lib missing)) + + dnl only check for Qt5 if we're actually building Qt + if test x$bitcoin_enable_qt != xno; then + AC_CHECK_LIB([Qt5PlatformSupport],[main],LIBS+=" -lQt5PlatformSupport", AC_MSG_ERROR(lib missing)) + fi + AC_DEFINE(USE_AVX2, 1, [Define this symbol if intel axv2 works]) esac fi