diff --git a/.cirrus.yml b/.cirrus.yml index acb95156..b32063db 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -2,13 +2,12 @@ FreeBSD_task: matrix: env: SSL: openssl - env: - SSL: openssl111 env: SSL: libressl env: SSL: libressl-devel env: + # base openssl SSL: matrix: freebsd_instance: diff --git a/src/Mayaqua/CMakeLists.txt b/src/Mayaqua/CMakeLists.txt index b4a536c3..01eeb303 100644 --- a/src/Mayaqua/CMakeLists.txt +++ b/src/Mayaqua/CMakeLists.txt @@ -65,7 +65,7 @@ if(UNIX) target_link_libraries(mayaqua PRIVATE OpenSSL::SSL OpenSSL::Crypto Threads::Threads ZLIB::ZLIB) - if (CMAKE_SYSTEM_PROCESSOR MATCHES "^(armv7l|aarch64|s390x)$" OR NOT HAVE_SYS_AUXV) + if (CMAKE_SYSTEM_PROCESSOR MATCHES "^(armv7l|aarch64|s390x)$" OR NOT HAVE_SYS_AUXV OR SKIP_CPU_FEATURES) add_definitions(-DSKIP_CPU_FEATURES) else() add_subdirectory(3rdparty/cpu_features)