Skip to content

Commit

Permalink
Experiment with defining _DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR on Windows
Browse files Browse the repository at this point in the history
  • Loading branch information
ianthomas23 committed Aug 7, 2024
1 parent a00a714 commit 437be4e
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 6 deletions.
13 changes: 7 additions & 6 deletions .github/workflows/cibuildwheel.yml
Original file line number Diff line number Diff line change
Expand Up @@ -112,14 +112,14 @@ jobs:
include:
- os: ubuntu-20.04
cibw_archs: "x86_64"
- os: ubuntu-20.04
cibw_archs: "aarch64"
#- os: ubuntu-20.04
# cibw_archs: "aarch64"
- os: windows-latest
cibw_archs: "auto64"
- os: macos-12
cibw_archs: "x86_64"
- os: macos-14
cibw_archs: "arm64"
#- os: macos-12
# cibw_archs: "x86_64"
#- os: macos-14
# cibw_archs: "arm64"

steps:
- name: Set up QEMU
Expand All @@ -135,6 +135,7 @@ jobs:
path: dist/

- name: Build wheels for CPython 3.13
if: false
uses: pypa/cibuildwheel@7e5a838a63ac8128d71ab2dfd99e4634dd1bca09 # v2.19.2
with:
package-dir: dist/${{ needs.build_sdist.outputs.SDIST_NAME }}
Expand Down
5 changes: 5 additions & 0 deletions meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,11 @@ project(
cc = meson.get_compiler('c')
cpp = meson.get_compiler('cpp')

# Try defining _DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR on Windows to see what happens.
if cpp.get_id() == 'msvc'
add_global_arguments('-D_DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR', language : 'cpp')
endif

# https://mesonbuild.com/Python-module.html
py_mod = import('python')
py3 = py_mod.find_installation(pure: false)
Expand Down

0 comments on commit 437be4e

Please sign in to comment.