From b99b1689b7cef37266026a76bfca5657cbf09d65 Mon Sep 17 00:00:00 2001
From: SChernykh <15806605+SChernykh@users.noreply.github.com>
Date: Tue, 13 Feb 2024 15:23:32 +0100
Subject: [PATCH] Fixed compiler flags

---
 cmake/flags.cmake                |  4 ----
 cmake/grpc.cmake                 | 14 ++------------
 cmake/standard.cmake             |  4 ++++
 external/src/Tari/CMakeLists.txt |  2 --
 external/src/Tari/proto.h        |  5 -----
 external/src/grpc                |  2 +-
 tests/cmake/flags.cmake          |  4 ----
 tests/cmake/standard.cmake       |  4 ++++
 8 files changed, 11 insertions(+), 28 deletions(-)

diff --git a/cmake/flags.cmake b/cmake/flags.cmake
index 8986860..ea6cb00 100644
--- a/cmake/flags.cmake
+++ b/cmake/flags.cmake
@@ -1,7 +1,3 @@
-if (ARCH_ID MATCHES "^(aarch64|arm64|armv8-a)$")
-	set(ARMv8 1)
-endif()
-
 if (CMAKE_CXX_COMPILER_ID MATCHES GNU)
 	set(GENERAL_FLAGS "-pthread")
 
diff --git a/cmake/grpc.cmake b/cmake/grpc.cmake
index fa517b2..aa3da05 100644
--- a/cmake/grpc.cmake
+++ b/cmake/grpc.cmake
@@ -24,22 +24,12 @@ set(CARES_SHARED OFF CACHE BOOL "Build as a shared library")
 set(CARES_INSTALL OFF CACHE BOOL "Create installation targets (chain builders may want to disable this)")
 set(CARES_BUILD_TOOLS OFF CACHE BOOL "Build tools")
 
-if (CMAKE_CXX_COMPILER_ID MATCHES MSVC)
-	set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /W0 /Zi /Od /Ob0 /MP /MTd")
-	set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /W0 /Zi /Od /Ob0 /MP /MTd")
-	set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} /W0 /O1 /Ob2 /Oi /Os /Oy /MP /MT /GL")
-	set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /W0 /O1 /Ob2 /Oi /Os /Oy /MP /MT /GL")
-	set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} /W0 /Ob1 /Ot /Zi /MP /MT")
-	set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /W0 /Ob1 /Ot /Zi /MP /MT")
-else()
-	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Os -w")
-	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Os -w")
-endif()
-
 if ((CMAKE_C_COMPILER_ID MATCHES MSVC) OR (CMAKE_CXX_COMPILER_ID MATCHES MSVC))
 	include_directories(external/src/common)
 endif()
 
+add_definitions(-DPROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII=0)
+
 add_subdirectory(external/src/grpc)
 set(LIBS ${LIBS} grpc grpc++ libprotobuf)
 
diff --git a/cmake/standard.cmake b/cmake/standard.cmake
index bf0243f..6b679f5 100644
--- a/cmake/standard.cmake
+++ b/cmake/standard.cmake
@@ -11,3 +11,7 @@ if(NOT ARCH_ID)
   endif()
   string(TOLOWER "${CMAKE_SYSTEM_PROCESSOR}" ARCH_ID)
 endif()
+
+if (ARCH_ID MATCHES "^(aarch64|arm64|armv8-a)$")
+	set(ARMv8 1)
+endif()
diff --git a/external/src/Tari/CMakeLists.txt b/external/src/Tari/CMakeLists.txt
index dec67f8..c39b69a 100644
--- a/external/src/Tari/CMakeLists.txt
+++ b/external/src/Tari/CMakeLists.txt
@@ -36,8 +36,6 @@ include_directories(../grpc/third_party/protobuf/src)
 include_directories(../grpc/include)
 include_directories(../grpc/third_party/abseil-cpp)
 
-set(DISABLE_WARNINGS ON)
-
 if (CMAKE_CXX_COMPILER_ID MATCHES MSVC)
 	set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /W0 /Zi /Od /Ob0 /MP /MTd")
 	set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /W0 /Zi /Od /Ob0 /MP /MTd")
diff --git a/external/src/Tari/proto.h b/external/src/Tari/proto.h
index 9219dfe..842a5df 100644
--- a/external/src/Tari/proto.h
+++ b/external/src/Tari/proto.h
@@ -2,9 +2,6 @@
 
 #ifdef _MSC_VER
 #pragma warning(push, 0)
-#elif __GNUC__
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wundef"
 #endif
 
 #include "proto/gRPC/base_node.pb.h"
@@ -29,6 +26,4 @@
 
 #ifdef _MSC_VER
 #pragma warning(pop)
-#elif __GNUC__
-#pragma GCC diagnostic pop
 #endif
diff --git a/external/src/grpc b/external/src/grpc
index a10d860..0de6f57 160000
--- a/external/src/grpc
+++ b/external/src/grpc
@@ -1 +1 @@
-Subproject commit a10d860cccab6e0ee4de8e0cf4d976b1545a66e3
+Subproject commit 0de6f576b3b91c51eacc65ab0590694dbefa7663
diff --git a/tests/cmake/flags.cmake b/tests/cmake/flags.cmake
index 03faea6..cb9b8ba 100644
--- a/tests/cmake/flags.cmake
+++ b/tests/cmake/flags.cmake
@@ -1,7 +1,3 @@
-if (ARCH_ID MATCHES "^(aarch64|arm64|armv8-a)$")
-	set(ARMv8 1)
-endif()
-
 if (CMAKE_CXX_COMPILER_ID MATCHES GNU)
 	set(GENERAL_FLAGS "-pthread")
 	set(WARNING_FLAGS "-Wall -Wextra")
diff --git a/tests/cmake/standard.cmake b/tests/cmake/standard.cmake
index bf0243f..6b679f5 100644
--- a/tests/cmake/standard.cmake
+++ b/tests/cmake/standard.cmake
@@ -11,3 +11,7 @@ if(NOT ARCH_ID)
   endif()
   string(TOLOWER "${CMAKE_SYSTEM_PROCESSOR}" ARCH_ID)
 endif()
+
+if (ARCH_ID MATCHES "^(aarch64|arm64|armv8-a)$")
+	set(ARMv8 1)
+endif()