diff -ur percona-server-5.7.35-38.orig/cmake/maintainer.cmake percona-server-5.7.35-38/cmake/maintainer.cmake
--- percona-server-5.7.35-38.orig/cmake/maintainer.cmake	2021-11-25 00:03:41.234897661 +0100
+++ percona-server-5.7.35-38/cmake/maintainer.cmake	2021-11-25 00:05:01.649091453 +0100
@@ -37,12 +37,6 @@
       "${MY_CXX_WARNING_FLAGS} -Wno-null-conversion -Wno-unused-private-field")
 ENDIF()
 
-# Turn on Werror (warning => error) when using maintainer mode.
-IF(MYSQL_MAINTAINER_MODE)
-  STRING_APPEND(MY_C_WARNING_FLAGS   " -Werror")
-  STRING_APPEND(MY_CXX_WARNING_FLAGS " -Werror")
-ENDIF()
-
 # Set warning flags for GCC/Clang
 IF(CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID MATCHES "Clang")
   STRING_APPEND(CMAKE_C_FLAGS " ${MY_C_WARNING_FLAGS}")
diff -ur percona-server-5.7.35-38.orig/storage/rocksdb/CMakeLists.txt percona-server-5.7.35-38/storage/rocksdb/CMakeLists.txt
--- percona-server-5.7.35-38.orig/storage/rocksdb/CMakeLists.txt	2021-11-25 00:03:45.359907607 +0100
+++ percona-server-5.7.35-38/storage/rocksdb/CMakeLists.txt	2021-11-25 00:04:04.352953376 +0100
@@ -57,7 +57,7 @@
   # get a list of rocksdb library source files
   # run with env -i to avoid passing variables
   EXECUTE_PROCESS(
-    COMMAND env -i ${CMAKE_CURRENT_SOURCE_DIR}/get_rocksdb_files.sh
+    COMMAND env -i PATH=$ENV{PATH} ${CMAKE_CURRENT_SOURCE_DIR}/get_rocksdb_files.sh
     OUTPUT_VARIABLE SCRIPT_OUTPUT
     WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
   )
diff -ur percona-server-5.7.35-38.orig/storage/tokudb/PerconaFT/cmake_modules/TokuSetupCompiler.cmake percona-server-5.7.35-38/storage/tokudb/PerconaFT/cmake_modules/TokuSetupCompiler.cmake
--- percona-server-5.7.35-38.orig/storage/tokudb/PerconaFT/cmake_modules/TokuSetupCompiler.cmake	2021-11-25 00:03:46.402910121 +0100
+++ percona-server-5.7.35-38/storage/tokudb/PerconaFT/cmake_modules/TokuSetupCompiler.cmake	2021-11-25 00:04:04.352953376 +0100
@@ -221,10 +221,6 @@
   prepend_cflags_if_supported_remove_unsupported(-Wcast-align)
 endif ()
 
-## always want these
-set(CMAKE_C_FLAGS "-Wall -Werror ${CMAKE_C_FLAGS}")
-set(CMAKE_CXX_FLAGS "-Wall -Werror ${CMAKE_CXX_FLAGS}")
-
 # pick language dialect
 set(CMAKE_C_FLAGS "-std=c99 ${CMAKE_C_FLAGS}")
 check_cxx_compiler_flag(-std=c++11 HAVE_STDCXX11)