Skip to content

Commit 37c6336

Browse files
committed
PR feedback
1 parent fb1888d commit 37c6336

1 file changed

Lines changed: 8 additions & 7 deletions

File tree

eng/native/configurecompiler.cmake

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -620,6 +620,14 @@ if (CLR_CMAKE_HOST_UNIX)
620620

621621
# clang 18.1 supressions
622622
add_compile_options(-Wno-switch-default)
623+
624+
# clang 20 suppressions
625+
if (CMAKE_CXX_COMPILER_ID)
626+
check_cxx_compiler_flag(-Wnontrivial-memaccess COMPILER_SUPPORTS_W_NONTRIVIAL_MEMACCESS)
627+
if (COMPILER_SUPPORTS_W_NONTRIVIAL_MEMACCESS)
628+
add_compile_options($<$<COMPILE_LANGUAGE:CXX>:-Wno-nontrivial-memaccess>)
629+
endif()
630+
endif()
623631
else()
624632
add_compile_options(-Wno-uninitialized)
625633
add_compile_options(-Wno-strict-aliasing)
@@ -645,13 +653,6 @@ if (CLR_CMAKE_HOST_UNIX)
645653
endif()
646654
endif()
647655

648-
if (CMAKE_CXX_COMPILER_ID)
649-
check_cxx_compiler_flag(-Wno-nontrivial-memaccess COMPILER_SUPPORTS_FNO_NONTRIVIAL_MEMACCESS)
650-
if (COMPILER_SUPPORTS_FNO_NONTRIVIAL_MEMACCESS)
651-
add_compile_options($<$<COMPILE_LANGUAGE:CXX>:-Wno-nontrivial-memaccess>)
652-
endif()
653-
endif()
654-
655656
# Some architectures (e.g., ARM) assume char type is unsigned while CoreCLR assumes char is signed
656657
# as x64 does. It has been causing issues in ARM (https://github.com/dotnet/runtime/issues/5778)
657658
add_compile_options(-fsigned-char)

0 commit comments

Comments
 (0)