Skip to content

Commit

Permalink
Revert "Define _DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR (#21005)"
Browse files Browse the repository at this point in the history
This reverts commit 94aa21c.
  • Loading branch information
snnn committed Oct 18, 2024
1 parent ac3fc9b commit ce962d9
Showing 1 changed file with 1 addition and 5 deletions.
6 changes: 1 addition & 5 deletions tools/ci_build/build.py
Original file line number Diff line number Diff line change
Expand Up @@ -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 += [
Expand Down

0 comments on commit ce962d9

Please sign in to comment.