Temporarily disable std::mutex's constructor being constexpr.

TileDB-Inc · Jun 7, 2024 · b8d09b7 · b8d09b7
1 parent 26e65ef
commit b8d09b7
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 0 deletions.
diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml
@@ -42,6 +42,7 @@ jobs:
       TILEDB_WEBP: ${{ matrix.TILEDB_WEBP }}
       TILEDB_CMAKE_BUILD_TYPE: 'Release'
       VCPKG_BINARY_SOURCES: 'clear;x-gha,readwrite'
+      CXXFLAGS: '/D_DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR' # https://github.com/actions/runner-images/issues/10004
     steps:
       - name: 'tiledb env prep'
         run: |

diff --git a/.github/workflows/unit-test-runs.yml b/.github/workflows/unit-test-runs.yml
@@ -4,6 +4,7 @@ on:
 
 env:
   VCPKG_BINARY_SOURCES: 'clear;x-gha,readwrite'
+  CXXFLAGS: '/D_DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR' # https://github.com/actions/runner-images/issues/10004
 
 jobs:
   build:

diff --git a/ports/triplets/x64-windows-asan.cmake b/ports/triplets/x64-windows-asan.cmake
@@ -7,3 +7,7 @@ set(X_VCPKG_APPLOCAL_DEPS_INSTALL ON)
 # bigobj is needed for capnp.
 set(VCPKG_C_FLAGS "/fsanitize=address /bigobj")
 set(VCPKG_CXX_FLAGS "/fsanitize=address /bigobj")
+
+# https://github.com/actions/runner-images/issues/10004
+list(APPEND VCPKG_C_FLAGS "/D_DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR")
+list(APPEND VCPKG_CXX_FLAGS "/D_DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR")
diff --git a/ports/triplets/x64-windows.cmake b/ports/triplets/x64-windows.cmake
@@ -2,4 +2,8 @@ set(VCPKG_TARGET_ARCHITECTURE x64)
 set(VCPKG_CRT_LINKAGE dynamic)
 set(VCPKG_LIBRARY_LINKAGE static)
 
+# https://github.com/actions/runner-images/issues/10004
+set(VCPKG_C_FLAGS "/D_DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR")
+set(VCPKG_CXX_FLAGS "/D_DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR")
+
 set(X_VCPKG_APPLOCAL_DEPS_INSTALL ON)
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,6 +4,7 @@ on: @@
     env:
       VCPKG_BINARY_SOURCES: 'clear;x-gha,readwrite'
+      CXXFLAGS: '/D_DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR' # https://github.com/actions/runner-images/issues/10004
     jobs:
       build:
@@ Expand Down @@