diff options
Diffstat (limited to 'numpy/core')
-rw-r--r-- | numpy/core/setup.py | 5 | ||||
-rw-r--r-- | numpy/core/src/private/npy_config.h | 5 |
2 files changed, 9 insertions, 1 deletions
diff --git a/numpy/core/setup.py b/numpy/core/setup.py index aa9e03e06..2a1ae5f62 100644 --- a/numpy/core/setup.py +++ b/numpy/core/setup.py @@ -101,6 +101,8 @@ def win32_checks(deflist): deflist.append('FORCE_NO_LONG_DOUBLE_FORMATTING') def check_math_capabilities(config, moredefs, mathlibs): + from numpy.distutils.misc_util import mingw32 + def check_func(func_name): return config.check_func(func_name, libraries=mathlibs, decl=True, call=True) @@ -170,7 +172,8 @@ def check_math_capabilities(config, moredefs, mathlibs): # C99 functions: float and long double versions check_funcs(C99_FUNCS_SINGLE) - check_funcs(C99_FUNCS_EXTENDED) + if not mingw32(): + check_funcs(C99_FUNCS_EXTENDED) def check_complex(config, mathlibs): priv = [] diff --git a/numpy/core/src/private/npy_config.h b/numpy/core/src/private/npy_config.h index fa20eb4f3..c81f06461 100644 --- a/numpy/core/src/private/npy_config.h +++ b/numpy/core/src/private/npy_config.h @@ -61,6 +61,11 @@ #endif +/* Disable broken mingw-w64 hypot function */ +#if defined(__MINGW32__) +#undef HAVE_HYPOT +#endif + /* Intel C for Windows uses POW for 64 bits longdouble*/ #if defined(_MSC_VER) && defined(__INTEL_COMPILER) |