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/build_ext.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/build_ext.py')
| -rw-r--r-- | numpy/distutils/command/build_ext.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/numpy/distutils/command/build_ext.py b/numpy/distutils/command/build_ext.py index d95faf5e1..0fa52a281 100644 --- a/numpy/distutils/command/build_ext.py +++ b/numpy/distutils/command/build_ext.py @@ -420,7 +420,7 @@ class build_ext (old_build_ext): linker = self.compiler.link_shared_object # Always use system linker when using MSVC compiler. - if self.compiler.compiler_type=='msvc': + if self.compiler.compiler_type in ('msvc', 'intelw', 'intelemw'): # expand libraries with fcompiler libraries as we are # not using fcompiler linker self._libs_with_msvc_and_fortran(fcompiler, libraries, library_dirs) |