Merge pull request #5831 from charris/rebase-gh-5237

rebase-gh-5237 - BUG: Workaround segfault in Apple Accelerate framework SGEMV

1 files changed, 3 insertions, 0 deletions

diff --git a/numpy/core/setup.py b/numpy/core/setup.py
index 11b443cf8..7a82f1e35 100644
--- a/numpy/core/setup.py
+++ b/numpy/core/setup.py
@@ -12,6 +12,7 @@ from os.path import join
 from numpy.distutils import log
 from distutils.dep_util import newer
 from distutils.sysconfig import get_config_var
+from numpy.build_utils.apple_accelerate import uses_accelerate_framework, get_sgemv_fix
 
 from setup_common import *
 
@@ -838,6 +839,8 @@ def configuration(parent_package='',top_path=None):
         multiarray_src.extend([join('src', 'multiarray', 'cblasfuncs.c'),
                                join('src', 'multiarray', 'python_xerbla.c'),
                               ])
+        if uses_accelerate_framework(blas_info):
+            multiarray_src.extend(get_sgemv_fix())
     else:
         extra_info = {}