From ec56ee1c4ef750c9db7b2ab6ab4bf1658971a070 Mon Sep 17 00:00:00 2001 From: Ralf Gommers Date: Mon, 17 Oct 2011 22:54:18 +0200 Subject: BLD: fix up detection of Intel CPU on OS X in system_info.py. --- numpy/distutils/system_info.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/numpy/distutils/system_info.py b/numpy/distutils/system_info.py index 9d3d9d079..7994583f0 100644 --- a/numpy/distutils/system_info.py +++ b/numpy/distutils/system_info.py @@ -125,6 +125,7 @@ from distutils.errors import DistutilsError from distutils.dist import Distribution import distutils.sysconfig from distutils import log +from distutils.util import get_platform from numpy.distutils.exec_command import \ find_executable, exec_command, get_pythonexe @@ -1275,7 +1276,6 @@ Make sure that -lgfortran is used for C++ extensions. result = _cached_atlas_version[key] = atlas_version, info return result -from distutils.util import get_platform class lapack_opt_info(system_info): @@ -1286,7 +1286,8 @@ class lapack_opt_info(system_info): if sys.platform=='darwin' and not os.environ.get('ATLAS',None): args = [] link_args = [] - if get_platform()[-4:] == 'i386': + if get_platform()[-4:] == 'i386' or 'intel' in get_platform() or \ + 'i386' in platform.platform(): intel = 1 else: intel = 0 @@ -1373,7 +1374,8 @@ class blas_opt_info(system_info): if sys.platform=='darwin' and not os.environ.get('ATLAS',None): args = [] link_args = [] - if get_platform()[-4:] == 'i386': + if get_platform()[-4:] == 'i386' or 'intel' in get_platform() or \ + 'i386' in platform.platform(): intel = 1 else: intel = 0 -- cgit v1.2.1