diff options
Diffstat (limited to 'numpy/distutils/command')
| -rw-r--r-- | numpy/distutils/command/build_ext.py | 2 | ||||
| -rw-r--r-- | numpy/distutils/command/config.py | 3 |
2 files changed, 3 insertions, 2 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) 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 |