Skip to content

Commit

Permalink
Remove Windows C++ redist hack (microsoft#6692)
Browse files Browse the repository at this point in the history
This removes the hack introduced in microsoft#6683 to workaround issues in the
GitHub and ADO runner image:
actions/runner-images#10004

Rumor has it the runner images are now fixed... let's see.

Fixes microsoft#6674
  • Loading branch information
llvm-beanz committed Jun 17, 2024
1 parent 8c3f40c commit 98bb80a
Showing 1 changed file with 0 additions and 6 deletions.
6 changes: 0 additions & 6 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -120,12 +120,6 @@ if(WIN32 AND NOT (CMAKE_C_COMPILER_ARCHITECTURE_ID MATCHES "ARM.*"))
add_link_options(/CETCOMPAT)
endif()

# This is a hack workaround for the broken azure runner images:
# https://github.com/actions/runner-images/issues/10004
if(WIN32)
add_compile_definitions(_DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR)
endif()

# HLSL Change Ends

# HLSL Change Starts - set flag for Appveyor CI
Expand Down

0 comments on commit 98bb80a

Please sign in to comment.