From 5a51c2e8b53358496f6c0ea743c2edf179a30239 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Tue, 1 Aug 2023 11:48:37 -0700 Subject: CMake: remove check for statx() and replace with STATX_BASIC_STATS We were already using this in qfilesystemengine_unix.cpp. In fact, the only place where we had QT_CONFIG(statx) was in minimum-linux_p.h. Saves 350 ms of CMake time. Change-Id: Ifbf974a4d10745b099b1fffd177756e2edf2bf3e Reviewed-by: Alexey Edelev --- src/corelib/global/minimum-linux_p.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/corelib/global/minimum-linux_p.h') diff --git a/src/corelib/global/minimum-linux_p.h b/src/corelib/global/minimum-linux_p.h index a9aa6c5234..d52df474fb 100644 --- a/src/corelib/global/minimum-linux_p.h +++ b/src/corelib/global/minimum-linux_p.h @@ -22,6 +22,7 @@ // #include "private/qglobal_p.h" +#include QT_BEGIN_NAMESPACE @@ -40,10 +41,10 @@ QT_BEGIN_NAMESPACE * - accept4 2.6.28 * - renameat2 3.16 QT_CONFIG(renameat2) * - getrandom 3.17 QT_CONFIG(getentropy) - * - statx 4.11 QT_CONFIG(statx) + * - statx 4.11 STATX_BASIC_STATS */ -#if QT_CONFIG(statx) && defined(__GLIBC__) +#if defined(__GLIBC__) && defined(STATX_BASIC_STATS) // if using glibc, the statx() function in sysdeps/unix/sysv/linux/statx.c // falls back to stat() for us. # define QT_ELF_NOTE_OS_MAJOR 4 @@ -58,6 +59,7 @@ QT_BEGIN_NAMESPACE # define QT_ELF_NOTE_OS_MINOR 16 # define QT_ELF_NOTE_OS_PATCH 0 #else + # define QT_ELF_NOTE_OS_MAJOR 2 # define QT_ELF_NOTE_OS_MINOR 6 # define QT_ELF_NOTE_OS_PATCH 28 -- cgit v1.2.3