Skip to content

Define _DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR #21005

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tianleiwu merged 2 commits into from
Jun 12, 2024
Merged

Define _DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR #21005

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
28413ac
Define _DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR
baijumeswani Jun 11, 2024
797f771
Address PR comment
baijumeswani Jun 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion tools/ci_build/build.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1548,7 +1548,11 @@ def generate_build_tree(
and not args.build_wasm
):
if is_windows():
cflags += ["/guard:cf", "/DWIN32", "/D_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"]
if not args.use_gdk:
# Target Windows 10
cflags += [
Expand Down