summaryrefslogtreecommitdiff
path: root/numpy/core/bscript
diff options
context:
space:
mode:
authorCharles Harris <charlesr.harris@gmail.com>2014-12-19 19:47:55 -0700
committerCharles Harris <charlesr.harris@gmail.com>2014-12-24 10:38:42 -0700
commit75666e3abce678b4ddaee1c9f65ea497a234fae0 (patch)
tree477bf39f128d422c92f27dfbf9410d3791f60978 /numpy/core/bscript
parent3ef77eea0d9c2cd76bc9b89b04a32f1322f842d5 (diff)
downloadnumpy-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/bscript')
-rw-r--r--numpy/core/bscript4
1 files changed, 3 insertions, 1 deletions
diff --git a/numpy/core/bscript b/numpy/core/bscript
index 5df5a3f8a..0f0f6816a 100644
--- a/numpy/core/bscript
+++ b/numpy/core/bscript
@@ -479,7 +479,9 @@ def pre_build(context):
]
if bld.env.HAS_CBLAS:
- sources.append(pjoin('src', 'multiarray', 'cblasfuncs.c'))
+ sources.extend([pjoin('src', 'multiarray', 'cblasfuncs.c'),
+ pjoin('src', 'multiarray', 'python_xerbla.c'),
+ ])
else:
sources = extension.sources