diff options
| author | Ralf Gommers <ralf.gommers@gmail.com> | 2022-12-14 21:43:07 +0100 |
|---|---|---|
| committer | Ralf Gommers <ralf.gommers@gmail.com> | 2022-12-14 21:43:07 +0100 |
| commit | 0a6463bfd49b04fe642dac80cd54635f7ee631fc (patch) | |
| tree | 7dce7060eb6becd781581b3e4d15a8c87e98dcc0 | |
| parent | a185f4be433443c9e913217f9662b97a0ac3e9f7 (diff) | |
| download | numpy-0a6463bfd49b04fe642dac80cd54635f7ee631fc.tar.gz | |
BLD: fix issue in npymath on macOS arm64 in the Meson build
This was due to a cross-merge conflict. gh-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 gh-22796
[skip azp]
[skip circle]
[skip cirrus]
| -rw-r--r-- | numpy/core/meson.build | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/numpy/core/meson.build b/numpy/core/meson.build index 50cd8ccc5..f4c9f49b5 100644 --- a/numpy/core/meson.build +++ b/numpy/core/meson.build @@ -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, |