AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Wrap the GNU/Clang compiler-dependent flags with genex conditions

Browse Source 
If flags use CMake scopes that propagate them to user libraries, it may
lead to an issue, if user projects are built using different compiler.
We need to guard these flags to make sure that they only will apply to
respective compilers.

Pick-to: 6.5 6.6
Change-Id: I0fd5847447bd8373e8e07f64dae11f27f48c915d
Reviewed-by: Alexandru Croitor (OOO) <alexandru.croitor@qt.io>
Reviewed-by: Amir Masoud Abdol <amir.abdol@qt.io>
This commit is contained in:
Alexey Edelev 2023-05-12 17:21:22 +02:00
parent 59a740e997
commit a2b6c2f343
1 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
cmake/QtFlagHandlingHelpers.cmake
View File

@ -121,6 +121,16 @@ function(qt_internal_apply_gc_binaries target visibility)
message(FATAL_ERROR "Visibitily setting must be one of PRIVATE, INTERFACE or PUBLIC.") message(FATAL_ERROR "Visibitily setting must be one of PRIVATE, INTERFACE or PUBLIC.")
endif() endif()
string(JOIN "" clang_or_gcc_begin
"$<$<OR:"
"$<CXX_COMPILER_ID:GNU>,"
"$<CXX_COMPILER_ID:Clang>,"
"$<CXX_COMPILER_ID:AppleClang>,"
"$<CXX_COMPILER_ID:IntelLLVM>"
">:"
)
set(clang_or_gcc_end ">")
if ((GCC OR CLANG) AND NOT WASM AND NOT UIKIT AND NOT MSVC) if ((GCC OR CLANG) AND NOT WASM AND NOT UIKIT AND NOT MSVC)
if(APPLE) if(APPLE)
set(gc_sections_flag "-Wl,-dead_strip") set(gc_sections_flag "-Wl,-dead_strip")
@ -129,16 +139,19 @@ function(qt_internal_apply_gc_binaries target visibility)
elseif(LINUX OR BSD OR WIN32 OR ANDROID) elseif(LINUX OR BSD OR WIN32 OR ANDROID)
set(gc_sections_flag "-Wl,--gc-sections") set(gc_sections_flag "-Wl,--gc-sections")
endif() endif()
set(gc_sections_flag
"${clang_or_gcc_begin}${gc_sections_flag}${clang_or_gcc_end}")
endif() endif()
if(gc_sections_flag) if(gc_sections_flag)
target_link_options("${target}" ${visibility} "${gc_sections_flag}") target_link_options("${target}" ${visibility} "${gc_sections_flag}")
endif() endif()
if((GCC OR CLANG) AND NOT WASM AND NOT UIKIT AND NOT MSVC) if((GCC OR CLANG) AND NOT WASM AND NOT UIKIT AND NOT MSVC)
set(split_sections_flags "-ffunction-sections" "-fdata-sections") set(split_sections_flags
"${clang_or_gcc_begin}-ffunction-sections;-fdata-sections${clang_or_gcc_end}")
endif() endif()
if(split_sections_flags) if(split_sections_flags)
target_compile_options("${target}" ${visibility} ${split_sections_flags}) target_compile_options("${target}" ${visibility} "${split_sections_flags}")
endif() endif()
endfunction() endfunction()
@ -153,7 +166,12 @@ function(qt_internal_apply_intel_cet target visibility)
endif() endif()
if(GCC) if(GCC)
set(flags "-mshstk") string(JOIN "" flags
"$<$<OR:"
"$<CXX_COMPILER_ID:GNU>,"
"$<CXX_COMPILER_ID:Clang>,"
"$<CXX_COMPILER_ID:AppleClang>"
">:-mshstk>")
endif() endif()
if(flags) if(flags)
target_compile_options("${target}" ${visibility} "${flags}") target_compile_options("${target}" ${visibility} "${flags}")