diff options
Diffstat (limited to 'numpy/core/meson.build')
| -rw-r--r-- | numpy/core/meson.build | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/numpy/core/meson.build b/numpy/core/meson.build index e968fb336..e51a7ba3b 100644 --- a/numpy/core/meson.build +++ b/numpy/core/meson.build @@ -430,6 +430,7 @@ _numpyconfig_h = configure_file( # ---------------------------- staticlib_cflags = [] +staticlib_cppflags = [] if cc.get_id() == 'msvc' # Disable voltbl section for vc142 to allow link using mingw-w64; see: # https://github.com/matthew-brett/dll_investigation/issues/1#issuecomment-1100468171 @@ -443,6 +444,7 @@ endif # https://mesonbuild.com/Build-options.html#build-options if get_option('disable-simd-optimizations') staticlib_cflags += '-DNPY_DISABLE_OPTIMIZATION' + staticlib_cppflags += '-DNPY_DISABLE_OPTIMIZATION' endif npy_math_internal_h = custom_target( @@ -455,12 +457,13 @@ npymath_sources = [ src_file.process('src/npymath/ieee754.c.src'), src_file.process('src/npymath/npy_math_complex.c.src'), npy_math_internal_h, - 'src/npymath/halffloat.c', + 'src/npymath/halffloat.cpp', 'src/npymath/npy_math.c', ] npymath_lib = static_library('npymath', npymath_sources, c_args: staticlib_cflags, + cpp_args: staticlib_cppflags, include_directories: ['include', 'src/npymath', 'src/common'], dependencies: py_dep, install: true, |