From ce962d9e887136dc63c2c6c733067f1f40cfa496 Mon Sep 17 00:00:00 2001 From: Changming Sun Date: Fri, 18 Oct 2024 00:52:33 +0000 Subject: [PATCH] Revert "Define _DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR (#21005)" This reverts commit 94aa21c3dd73523853ef9bb9cb1220d527417335. --- tools/ci_build/build.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/tools/ci_build/build.py b/tools/ci_build/build.py index 384569997b9b6..9624f9112c49f 100644 --- a/tools/ci_build/build.py +++ b/tools/ci_build/build.py @@ -1552,11 +1552,7 @@ def generate_build_tree( and not args.build_wasm ): if is_windows(): - # DLL initialization errors due to old conda msvcp140.dll dll are a result of the new MSVC compiler - # See https://developercommunity.visualstudio.com/t/Access-violation-with-std::mutex::lock-a/10664660#T-N10668856 - # Remove this definition (_DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR) - # once the conda msvcp140.dll dll is updated. - cflags += ["/guard:cf", "/DWIN32", "/D_WINDOWS", "/D_DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR"] + cflags += ["/guard:cf", "/DWIN32", "/D_WINDOWS"] if not args.use_gdk: # Target Windows 10 cflags += [