Skip to content

Commit

Permalink
BLD: fix issue in npymath on macOS arm64 in the Meson build
Browse files Browse the repository at this point in the history
This was due to a cross-merge conflict. numpygh-22679 added a new file
to the setup.py build, while the Meson build got merged. It's
a file that only does anything on arm64 macOS, hence it wasn't
noticed in CI.

Addresses a "missing `npy_asinh`" problem discussed in numpygh-22796

[skip azp]
[skip circle]
[skip cirrus]
  • Loading branch information
rgommers committed Dec 14, 2022
1 parent a185f4b commit 0a6463b
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions numpy/core/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -461,6 +461,9 @@ npymath_sources = [
npy_math_internal_h,
'src/npymath/halffloat.c',
'src/npymath/npy_math.c',
# Remove this `arm64_exports.c` file once scipy macos arm64 build correctly
# links to the arm64 npymath library, see gh-22673
'src/npymath/arm64_exports.c',
]
npymath_lib = static_library('npymath',
npymath_sources,
Expand Down

0 comments on commit 0a6463b

Please sign in to comment.