Skip to content

Commit 7809c0b

Browse files
llvm-beanzGreg Roth
authored andcommitted
Remove Windows C++ redist hack (#6692)
This removes the hack introduced in #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 #6674 (cherry picked from commit 98bb80a)
1 parent 33277a1 commit 7809c0b

File tree

1 file changed

+0
-6
lines changed

1 file changed

+0
-6
lines changed

CMakeLists.txt

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -120,12 +120,6 @@ if(WIN32 AND NOT (CMAKE_C_COMPILER_ARCHITECTURE_ID MATCHES "ARM.*"))
120120
add_link_options(/CETCOMPAT)
121121
endif()
122122

123-
# This is a hack workaround for the broken azure runner images:
124-
# https://github.com/actions/runner-images/issues/10004
125-
if(WIN32)
126-
add_compile_definitions(_DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR)
127-
endif()
128-
129123
# HLSL Change Ends
130124

131125
# HLSL Change Starts - set flag for Appveyor CI

0 commit comments

Comments
 (0)