diff options
| -rw-r--r-- | scipy/distutils/fcompiler/intel.py | 2 | ||||
| -rw-r--r-- | scipy/distutils/intelccompiler.py | 14 |
2 files changed, 11 insertions, 5 deletions
diff --git a/scipy/distutils/fcompiler/intel.py b/scipy/distutils/fcompiler/intel.py index 2cd255d98..0e7375943 100644 --- a/scipy/distutils/fcompiler/intel.py +++ b/scipy/distutils/fcompiler/intel.py @@ -73,7 +73,7 @@ class IntelItaniumFCompiler(IntelFCompiler): ' for the Itanium\(TM\)-based applications,'\ ' Version (?P<version>[^\s*]*)' - for fc_exe in map(find_executable,['efort','efc','ifort']): + for fc_exe in map(find_executable,['ifort','efort','efc']): if os.path.isfile(fc_exe): break diff --git a/scipy/distutils/intelccompiler.py b/scipy/distutils/intelccompiler.py index 461074ba0..87b7f564b 100644 --- a/scipy/distutils/intelccompiler.py +++ b/scipy/distutils/intelccompiler.py @@ -13,12 +13,18 @@ class IntelCCompiler(UnixCCompiler): def __init__ (self, verbose=0, dry_run=0, force=0): UnixCCompiler.__init__ (self, verbose,dry_run, force) - self.linker = self.cc_exe - self.set_executable(linker_so=self.linker + ' -shared') + compiler = self.cc_exe + self.set_executables(compiler=compiler, + compiler_so=compiler, + compiler_cxx=compiler, + linker_exe=compiler, + linker_so=compiler + ' -shared') -class IntelItaniumCompiler(IntelCCompiler): +class IntelItaniumCCompiler(IntelCCompiler): compiler_type = 'intele' - for cc_exe in map(find_executable,['ecc','icc']): + # On Itanium, the Intel Compiler used to be called ecc, let's search for + # it (now it's also icc, so ecc is last in the search). + for cc_exe in map(find_executable,['icc','ecc']): if os.path.isfile(cc_exe): break |