diff options
author | Charles Harris <charlesr.harris@gmail.com> | 2020-01-01 12:06:54 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-01-01 12:06:54 -0700 |
commit | 3487c36eae4f380a42d98a0da0e32d362bf070ab (patch) | |
tree | 5be5e4f173fd73bae13daaac09e12d7f9a2eddb7 /numpy | |
parent | b95d13652e229c4cb4a78bf03187be799fd66213 (diff) | |
parent | dc0adc9aeb59ce6de9c6ce7938e8c91133a05420 (diff) | |
download | numpy-3487c36eae4f380a42d98a0da0e32d362bf070ab.tar.gz |
Merge pull request #15211 from pv/openblas64-msvc-fix
BUG: distutils: fix msvc+gfortran openblas handling corner case
Diffstat (limited to 'numpy')
-rw-r--r-- | numpy/distutils/system_info.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/numpy/distutils/system_info.py b/numpy/distutils/system_info.py index 4786b3a0c..fc7018af3 100644 --- a/numpy/distutils/system_info.py +++ b/numpy/distutils/system_info.py @@ -2102,16 +2102,17 @@ class openblas_info(blas_info): return None # Generate numpy.distutils virtual static library file - tmpdir = os.path.join(os.getcwd(), 'build', 'openblas') + basename = self.__class__.__name__ + tmpdir = os.path.join(os.getcwd(), 'build', basename) if not os.path.isdir(tmpdir): os.makedirs(tmpdir) info = {'library_dirs': [tmpdir], - 'libraries': ['openblas'], + 'libraries': [basename], 'language': 'f77'} - fake_lib_file = os.path.join(tmpdir, 'openblas.fobjects') - fake_clib_file = os.path.join(tmpdir, 'openblas.cobjects') + fake_lib_file = os.path.join(tmpdir, basename + '.fobjects') + fake_clib_file = os.path.join(tmpdir, basename + '.cobjects') with open(fake_lib_file, 'w') as f: f.write("\n".join(library_paths)) with open(fake_clib_file, 'w') as f: |