diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2016-01-17 12:08:43 -0700 |
|---|---|---|
| committer | Charles Harris <charlesr.harris@gmail.com> | 2016-01-17 12:08:43 -0700 |
| commit | 54b80df9203d34efd11334ede8c0d93dfba89689 (patch) | |
| tree | 53fddbaf862981a97b7e882d015e662e69a4992f /numpy | |
| parent | 46bb5350148ea271dc336ccda33b3a8857d57ad0 (diff) | |
| parent | 2da37a0e49c169f79f98e0e9d5b0370e9344029f (diff) | |
| download | numpy-54b80df9203d34efd11334ede8c0d93dfba89689.tar.gz | |
Merge pull request #7048 from zerothi/enh-fix-distutils.libs
ENH: Allow site.cfg information with libraries key
Diffstat (limited to 'numpy')
| -rw-r--r-- | numpy/distutils/system_info.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/numpy/distutils/system_info.py b/numpy/distutils/system_info.py index d7b9bfbed..a541bfae2 100644 --- a/numpy/distutils/system_info.py +++ b/numpy/distutils/system_info.py @@ -663,7 +663,10 @@ class system_info(object): return [b for b in [a.strip() for a in libs.split(',')] if b] def get_libraries(self, key='libraries'): - return self.get_libs(key, '') + if hasattr(self, '_lib_names'): + return self.get_libs(key, default=self._lib_names) + else: + return self.get_libs(key, '') def library_extensions(self): static_exts = ['.a'] |