diff options
| author | Ralf Gommers <ralf.gommers@gmail.com> | 2015-08-02 21:49:57 +0200 |
|---|---|---|
| committer | Charles Harris <charlesr.harris@gmail.com> | 2015-08-03 11:38:44 -0600 |
| commit | 2ce50d23bce43610a04eaee752fb116d46076187 (patch) | |
| tree | 9444f0c9f67222daf306a70c8a0caa32ec687e1f /numpy/distutils/command/config.py | |
| parent | 0d294c15be17109d683eec01cf588dc8a5aea1d9 (diff) | |
| download | numpy-2ce50d23bce43610a04eaee752fb116d46076187.tar.gz | |
BLD: some fixes for Intel compilers.
- Fix an incorrect import
- Enable C99 complex support (Qstd=c99)
- Don't use MSVC complex types for Intel compilers
Thanks to Intel for this patch (contact: Yolanda Chen).
Diffstat (limited to 'numpy/distutils/command/config.py')
| -rw-r--r-- | numpy/distutils/command/config.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/numpy/distutils/command/config.py b/numpy/distutils/command/config.py index 47dc17df3..4f20fc0de 100644 --- a/numpy/distutils/command/config.py +++ b/numpy/distutils/command/config.py @@ -39,7 +39,8 @@ class config(old_config): old_config._check_compiler(self) from numpy.distutils.fcompiler import FCompiler, new_fcompiler - if sys.platform == 'win32' and self.compiler.compiler_type == 'msvc': + if sys.platform == 'win32' and (self.compiler.compiler_type in + ('msvc', 'intelw', 'intelemw')): # XXX: hack to circumvent a python 2.6 bug with msvc9compiler: # initialize call query_vcvarsall, which throws an IOError, and # causes an error along the way without much information. We try to |