From c2ad0220e0653ba0c481eb65fb468b0dcaba4bac Mon Sep 17 00:00:00 2001
From: Eric Joldasov <bratishkaerik@getgoogleoff.me>
Date: Tue, 14 May 2024 20:20:25 +0500
Subject: [PATCH] CMake: remove C/C++ flags override for static executable

They were introduced in https://github.com/ziglang/zig/pull/3467 and
5b51f41ceed6604b388b63d73360a22d1ea95749 , and become obsolete since
C++-based compiler was removed: all C or C++ sources built by CMake
are just intermediate steps in bootstrapping.

Signed-off-by: Eric Joldasov <bratishkaerik@landless-city.net>
---
 CMakeLists.txt                 |  5 -----
 cmake/c_flag_overrides.cmake   | 13 -------------
 cmake/cxx_flag_overrides.cmake | 13 -------------
 3 files changed, 31 deletions(-)
 delete mode 100644 cmake/c_flag_overrides.cmake
 delete mode 100644 cmake/cxx_flag_overrides.cmake

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4d92e0886fef40ec468d5b38e8ef66a4aaea4329..900032617a26b0466fe03e521a120662f0f34426 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -27,11 +27,6 @@ else()
   list(APPEND ZIG_CMAKE_PREFIX_PATH "${ZIG_CMAKE_PREFIX_PATH_STRING}")
 endif()
 
-set(CMAKE_USER_MAKE_RULES_OVERRIDE
-   ${CMAKE_CURRENT_SOURCE_DIR}/cmake/c_flag_overrides.cmake)
-set(CMAKE_USER_MAKE_RULES_OVERRIDE_CXX
-   ${CMAKE_CURRENT_SOURCE_DIR}/cmake/cxx_flag_overrides.cmake)
-
 project(zig C CXX)
 set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH})
 
diff --git a/cmake/c_flag_overrides.cmake b/cmake/c_flag_overrides.cmake
deleted file mode 100644
index c3225d2c4792eeaf320563a0caacd5b75611f3ec..0000000000000000000000000000000000000000
--- a/cmake/c_flag_overrides.cmake
+++ /dev/null
@@ -1,13 +0,0 @@
-if(MSVC)
-    set(CMAKE_C_FLAGS_DEBUG_INIT
-        "/D_DEBUG /MTd /Zi /Ob0 /Od /RTC1")
-
-    set(CMAKE_C_FLAGS_MINSIZEREL_INIT
-        "/MT /O1 /Ob1 /D NDEBUG")
-
-    set(CMAKE_C_FLAGS_RELEASE_INIT
-        "/MT /O2 /Ob1 /D NDEBUG")
-
-    set(CMAKE_C_FLAGS_RELWITHDEBINFO_INIT
-        "/MT /Zi /O2 /Ob1 /D NDEBUG")
-endif()
diff --git a/cmake/cxx_flag_overrides.cmake b/cmake/cxx_flag_overrides.cmake
deleted file mode 100644
index 2f5473df93e1220ce137ed5324cb0738081ada90..0000000000000000000000000000000000000000
--- a/cmake/cxx_flag_overrides.cmake
+++ /dev/null
@@ -1,13 +0,0 @@
-if(MSVC)
-    set(CMAKE_CXX_FLAGS_DEBUG_INIT
-        "/D_DEBUG /MTd /Zi /Ob0 /Od /RTC1")
-
-    set(CMAKE_CXX_FLAGS_MINSIZEREL_INIT
-        "/MT /O1 /Ob1 /D NDEBUG")
-
-    set(CMAKE_CXX_FLAGS_RELEASE_INIT
-        "/MT /O2 /Ob1 /D NDEBUG")
-
-    set(CMAKE_CXX_FLAGS_RELWITHDEBINFO_INIT
-        "/MT /Zi /O2 /Ob1 /D NDEBUG")
-endif()
-- 
2.54.0