diff options
Diffstat (limited to 'numpy/distutils/fcompiler/intel.py')
| -rw-r--r-- | numpy/distutils/fcompiler/intel.py | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/numpy/distutils/fcompiler/intel.py b/numpy/distutils/fcompiler/intel.py index 59308742d..03ff1adbf 100644 --- a/numpy/distutils/fcompiler/intel.py +++ b/numpy/distutils/fcompiler/intel.py @@ -74,9 +74,14 @@ class IntelFCompiler(FCompiler): class IntelItaniumFCompiler(IntelFCompiler): compiler_type = 'intele' - version_pattern = r'Intel\(R\) Fortran 90 Compiler Itanium\(TM\) Compiler'\ - ' for the Itanium\(TM\)-based applications,'\ - ' Version (?P<version>[^\s*]*)' + version_pattern = r'Intel\(R\) Fortran (90 Compiler Itanium\(TM\)|Itanium\(R\)) Compiler'\ + ' for (the Itanium\(TM\)|Itanium\(R\))-based applications(,|)'\ + '\s+Version (?P<version>[^\s*]*)' + +Intel(R) Fortran Itanium(R) Compiler for Itanium(R)-based applications +Version 9.1 Build 20060928 Package ID: l_fc_c_9.1.039 +Copyright (C) 1985-2006 Intel Corporation. All rights reserved. +30 DAY EVALUATION LICENSE for fc_exe in map(find_executable,['ifort','efort','efc']): if os.path.isfile(fc_exe): @@ -176,9 +181,9 @@ class IntelVisualFCompiler(FCompiler): class IntelItaniumVisualFCompiler(IntelVisualFCompiler): compiler_type = 'intelev' - version_pattern = r'Intel\(R\) Fortran 90 Compiler Itanium\(TM\) Compiler'\ - ' for the Itanium\(TM\)-based applications,'\ - ' Version (?P<version>[^\s*]*)' + version_pattern = r'Intel\(R\) Fortran (90 Compiler Itanium\(TM\)|Itanium\(R\)) Compiler'\ + ' for (the Itanium\(TM\)|Itanium\(R\))-based applications(,|)'\ + '\s+Version (?P<version>[^\s*]*)' fc_exe = 'efl' # XXX this is a wild guess ar_exe = IntelVisualFCompiler.ar_exe |