From 129dae5dbd0b4e51433a00b41282bcb8850fb2e3 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Fri, 17 Sep 2021 14:11:47 +0200 Subject: [PATCH] Pass CMAKE compiler flags to arch detection This fixes the detection of always available architecture based on user set CMAKE flags. Change-Id: I541ac9569766a0fe05f4395c06f2ee3bcd77b035 Fixes: QTBUG-91090 Reviewed-by: Qt CI Bot Reviewed-by: Alexandru Croitor --- cmake/QtFeature.cmake | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/cmake/QtFeature.cmake b/cmake/QtFeature.cmake index 2d200c0e2ea..fc2fb8f529a 100644 --- a/cmake/QtFeature.cmake +++ b/cmake/QtFeature.cmake @@ -945,6 +945,16 @@ function(qt_get_platform_try_compile_vars out_var) # Use the regular variables that are used for source-based try_compile() calls. set(flags "${CMAKE_TRY_COMPILE_PLATFORM_VARIABLES}") + # Pass custom flags. + list(APPEND flags "CMAKE_C_FLAGS") + list(APPEND flags "CMAKE_C_FLAGS_DEBUG") + list(APPEND flags "CMAKE_C_FLAGS_RELEASE") + list(APPEND flags "CMAKE_C_FLAGS_RELWITHDEBINFO") + list(APPEND flags "CMAKE_CXX_FLAGS") + list(APPEND flags "CMAKE_CXX_FLAGS_DEBUG") + list(APPEND flags "CMAKE_CXX_FLAGS_RELEASE") + list(APPEND flags "CMAKE_CXX_FLAGS_RELWITHDEBINFO") + # Pass toolchain files. if(CMAKE_TOOLCHAIN_FILE) list(APPEND flags "CMAKE_TOOLCHAIN_FILE")