Fix arm64 compilation

thaystg · Mar 9, 2021 · ae5f701 · ae5f701
1 parent 94d957c
commit ae5f701
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/eng/native/configurecompiler.cmake b/eng/native/configurecompiler.cmake
@@ -332,7 +332,6 @@ if (CLR_CMAKE_HOST_UNIX)
   add_compile_options(-Wno-unused-variable)
   add_compile_options(-Wno-unused-value)
   add_compile_options(-Wno-unused-function)
-  add_compile_options(-Wno-tautological-compare)
 
   check_cxx_compiler_flag(-Wimplicit-fallthrough COMPILER_SUPPORTS_W_IMPLICIT_FALLTHROUGH)
   if (COMPILER_SUPPORTS_W_IMPLICIT_FALLTHROUGH)
@@ -346,6 +345,7 @@ if (CLR_CMAKE_HOST_UNIX)
     # The -ferror-limit is helpful during the porting, it makes sure the compiler doesn't stop
     # after hitting just about 20 errors.
     add_compile_options(-ferror-limit=4096)
+    add_compile_options(-Wno-tautological-compare)
 
     # Disabled warnings
     add_compile_options(-Wno-unused-private-field)

diff --git a/src/mono/dbi/CMakeLists.txt b/src/mono/dbi/CMakeLists.txt
@@ -96,9 +96,11 @@ if (CLR_CMAKE_HOST_UNIX)
   include_directories("${PROJECT_SOURCE_DIR}/../../coreclr/pal/inc")
   include_directories("${PROJECT_SOURCE_DIR}/../../coreclr/pal/inc/rt")
   include_directories("${PROJECT_SOURCE_DIR}/../../coreclr/pal/src/safecrt")
-  append("-Wno-missing-prototypes -Wno-pointer-arith -Wno-macro-redefined" CMAKE_C_FLAGS CMAKE_CXX_FLAGS)
+  append("-Wno-missing-prototypes -Wno-pointer-arith" CMAKE_C_FLAGS CMAKE_CXX_FLAGS)
   if(TARGET_ARCH STREQUAL "arm64")
     append("-Wno-missing-declarations" CMAKE_C_FLAGS CMAKE_CXX_FLAGS)
+  else()
+    append("-Wno-macro-redefined")
   endif()
   add_subdirectory(${PROJECT_SOURCE_DIR}/../../coreclr/pal pal)