diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2014-12-19 19:47:55 -0700 |
|---|---|---|
| committer | Charles Harris <charlesr.harris@gmail.com> | 2014-12-24 10:38:42 -0700 |
| commit | 75666e3abce678b4ddaee1c9f65ea497a234fae0 (patch) | |
| tree | 477bf39f128d422c92f27dfbf9410d3791f60978 /numpy/core/setup.py | |
| parent | 3ef77eea0d9c2cd76bc9b89b04a32f1322f842d5 (diff) | |
| download | numpy-75666e3abce678b4ddaee1c9f65ea497a234fae0.tar.gz | |
BUG: Xerbla doesn't get linked in 1.10-devel.
Add our python_xerbla to the multiarray sources. That function is
needed for all modules that link to the ATLAS 3.10 libraries, which
are now all located in two files, libsatlas and libtatlas.
Also make the test for xerbla linkage work better. If xerbla is not
linked the test will be skipped with a message.
Closes #5362.
Diffstat (limited to 'numpy/core/setup.py')
| -rw-r--r-- | numpy/core/setup.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/numpy/core/setup.py b/numpy/core/setup.py index a51eb690b..f178c4032 100644 --- a/numpy/core/setup.py +++ b/numpy/core/setup.py @@ -839,7 +839,9 @@ def configuration(parent_package='',top_path=None): blas_info = get_info('blas_opt', 0) if blas_info and ('HAVE_CBLAS', None) in blas_info.get('define_macros', []): extra_info = blas_info - multiarray_src.append(join('src', 'multiarray', 'cblasfuncs.c')) + multiarray_src.extend([join('src', 'multiarray', 'cblasfuncs.c'), + join('src', 'multiarray', 'python_xerbla.c'), + ]) else: extra_info = {} |