Need to keep the warning disabled for zlib

madler/zlib#633
dotnet · Oct 1, 2022 · 5c1a7f7 · 5c1a7f7
1 parent 54da6cd
commit 5c1a7f7
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/src/mono/CMakeLists.txt b/src/mono/CMakeLists.txt
@@ -238,6 +238,7 @@ elseif(CMAKE_SYSTEM_NAME STREQUAL "Emscripten")
   set(HOST_BROWSER 1)
   add_definitions(-DNO_GLOBALIZATION_SHIM)
   add_definitions(-D_THREAD_SAFE)
+  add_compile_options(-Wno-strict-prototypes)
   add_compile_options(-Wno-unused-but-set-variable)
   set(DISABLE_EXECUTABLES 1)
   # FIXME: Is there a cmake option for this ?
@@ -262,7 +263,7 @@ elseif(CMAKE_SYSTEM_NAME STREQUAL "WASI")
     wasi/mono-wasi-driver/synthetic-pthread.c
   )
   add_library(mono-wasi-driver STATIC ${WASI_DRIVER_SOURCES})
-  target_compile_options(mono-wasi-driver PRIVATE -Wno-missing-prototypes)
+  target_compile_options(mono-wasi-driver PRIVATE -Wno-missing-prototypes s -Wno-strict-prototypes)
   install(TARGETS mono-wasi-driver LIBRARY)
 elseif(CMAKE_SYSTEM_NAME STREQUAL "Windows")
   set(HOST_WIN32 1)

diff --git a/src/native/libs/System.IO.Compression.Native/CMakeLists.txt b/src/native/libs/System.IO.Compression.Native/CMakeLists.txt
@@ -35,9 +35,13 @@ if (CLR_CMAKE_TARGET_UNIX OR CLR_CMAKE_TARGET_BROWSER)
         set(NATIVECOMPRESSION_SOURCES ${ZLIB_SOURCES} ${NATIVECOMPRESSION_SOURCES})
     endif()
 
-    # Disable implicit fallthrough warning for Brotli
+    # Disable implicit fallthrough warning for Zlib and Brotli
     set(FLAGS -Wno-implicit-fallthrough)
 
+    # Disable no strict prototypes warning for Zlib
+    # https://github.com/madler/zlib/issues/633
+    set(FLAGS "${FLAGS} -Wno-strict-prototypes")
+
     # Delete this suppression once brotli is upgraded to vNext (current latest v1.0.9
     # does not contain upstream fix: https://github.com/google/brotli/commit/0a3944c)
     set(FLAGS "${FLAGS} -Wno-vla-parameter")