diff options
author | Charles Harris <charlesr.harris@gmail.com> | 2019-10-26 08:02:30 -0600 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-10-26 08:02:30 -0600 |
commit | d0ce0b3045baefa8fe48641d0c34fd7461165c2c (patch) | |
tree | 60dc8953cf08909dafe97cdb3f3f26cc6d464136 /numpy/distutils/system_info.py | |
parent | 7b9b41a4c7dbd7b719d62f343f57f841f5809693 (diff) | |
parent | 955b2906c6da37844b0ee54b8a53850cf5df199f (diff) | |
download | numpy-d0ce0b3045baefa8fe48641d0c34fd7461165c2c.tar.gz |
Merge pull request #14771 from mattip/gcc-4.8
TST, BUILD: add a gcc 4.8 run on ubuntu 18.04
Diffstat (limited to 'numpy/distutils/system_info.py')
-rw-r--r-- | numpy/distutils/system_info.py | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/numpy/distutils/system_info.py b/numpy/distutils/system_info.py index 5fd1003ab..c2b3e118b 100644 --- a/numpy/distutils/system_info.py +++ b/numpy/distutils/system_info.py @@ -156,7 +156,7 @@ from numpy.distutils.misc_util import (is_sequence, is_string, get_shared_lib_extension) from numpy.distutils.command.config import config as cmd_config from numpy.distutils.compat import get_exception -from numpy.distutils import customized_ccompiler +from numpy.distutils import customized_ccompiler as _customized_ccompiler from numpy.distutils import _shell_utils import distutils.ccompiler import tempfile @@ -169,6 +169,15 @@ _bits = {'32bit': 32, '64bit': 64} platform_bits = _bits[platform.architecture()[0]] +global_compiler = None + +def customized_ccompiler(): + global global_compiler + if not global_compiler: + global_compiler = _customized_ccompiler() + return global_compiler + + def _c_string_literal(s): """ Convert a python string into a literal suitable for inclusion into C code @@ -1580,7 +1589,7 @@ def get_atlas_version(**config): log.info('Status: %d', s) log.info('Output: %s', o) - if atlas_version == '3.2.1_pre3.3.6': + elif atlas_version == '3.2.1_pre3.3.6': dict_append(info, define_macros=[('NO_ATLAS_INFO', -2)]) else: dict_append(info, define_macros=[( |