From 91142ba5fe6b7ee11ead8b39e7140bd814497f2c Mon Sep 17 00:00:00 2001
From: Gold856 <117957790+Gold856@users.noreply.github.com>
Date: Sat, 16 Nov 2024 10:27:46 -0500
Subject: [PATCH] [build] Remove Windows constexpr mutex define (#7375)

Since we ship a newer runtime, and we also have checks to ensure a valid runtime, we can remove this again.
---
 cmake/modules/CompileWarnings.cmake          | 5 -----
 shared/bazel/compiler_flags/windows_flags.rc | 3 ---
 shared/config.gradle                         | 5 -----
 3 files changed, 13 deletions(-)

diff --git a/cmake/modules/CompileWarnings.cmake b/cmake/modules/CompileWarnings.cmake
index 7439333bad..b56c175a9b 100644
--- a/cmake/modules/CompileWarnings.cmake
+++ b/cmake/modules/CompileWarnings.cmake
@@ -55,9 +55,4 @@ macro(wpilib_target_warnings target)
     )
         target_compile_options(${target} PRIVATE -gz=zlib)
     endif()
-
-    # Disable std::mutex constexpr constructor on MSVC
-    if(MSVC)
-        target_compile_options(${target} PRIVATE /D_DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR)
-    endif()
 endmacro()
diff --git a/shared/bazel/compiler_flags/windows_flags.rc b/shared/bazel/compiler_flags/windows_flags.rc
index 7e604e43c9..54fbebb492 100644
--- a/shared/bazel/compiler_flags/windows_flags.rc
+++ b/shared/bazel/compiler_flags/windows_flags.rc
@@ -40,9 +40,6 @@ build:windows --config=windows_common
 
 build:windows --linkopt=/DEPENDENTLOADFLAG:0x1100
 
-# TODO
-build:windows --copt=/D_DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR
-
 ################################
 # ARM Windows Flags
 ################################
diff --git a/shared/config.gradle b/shared/config.gradle
index b570edc41b..d7dd9d55b9 100644
--- a/shared/config.gradle
+++ b/shared/config.gradle
@@ -39,11 +39,6 @@ nativeUtils.platformConfigs.each {
   }
 }
 
-// Disable std::mutex constexpr constructor on MSVC
-nativeUtils.platformConfigs.named(nativeUtils.wpi.platforms.windowsx64).configure {
-    it.cppCompiler.args.add("/D_DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR")
-}
-
 nativeUtils.platformConfigs.linuxathena.linker.args.add("-Wl,--fatal-warnings")
 
 model {