diff options
| author | Pearu Peterson <pearu.peterson@gmail.com> | 2006-04-19 19:20:04 +0000 |
|---|---|---|
| committer | Pearu Peterson <pearu.peterson@gmail.com> | 2006-04-19 19:20:04 +0000 |
| commit | dbe851fdd16fa7b829efdc698ff81b066ae52985 (patch) | |
| tree | 520760972b6a8df249d7bad1f3568f72bbbad18b /numpy/distutils/fcompiler/absoft.py | |
| parent | 8a31e29feafddc3c29bf1ca8ee378fb7b69c67b7 (diff) | |
| download | numpy-dbe851fdd16fa7b829efdc698ff81b066ae52985.tar.gz | |
Fix version detection of an older absoft compiler (version 2.3 to be specific).
Diffstat (limited to 'numpy/distutils/fcompiler/absoft.py')
| -rw-r--r-- | numpy/distutils/fcompiler/absoft.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/numpy/distutils/fcompiler/absoft.py b/numpy/distutils/fcompiler/absoft.py index 2ce36d856..a00ca78b8 100644 --- a/numpy/distutils/fcompiler/absoft.py +++ b/numpy/distutils/fcompiler/absoft.py @@ -17,9 +17,12 @@ class AbsoftFCompiler(FCompiler): compiler_type = 'absoft' #version_pattern = r'FORTRAN 77 Compiler (?P<version>[^\s*,]*).*?Absoft Corp' - version_pattern = r'(f90:.*?(Absoft Pro FORTRAN Version|FORTRAN 77 Compiler|Absoft Fortran Compiler Version))'+\ + version_pattern = r'(f90:.*?(Absoft Pro FORTRAN Version|FORTRAN 77 Compiler|Absoft Fortran Compiler Version|Copyright Absoft Corporation.*?Version))'+\ r' (?P<version>[^\s*,]*)(.*?Absoft Corp|)' + # on windows: f90 -V -c dummy.f + # f90: Copyright Absoft Corporation 1994-1998 mV2; Cray Research, Inc. 1994-1996 CF90 (2.x.x.x f36t87) Version 2.3 Wed Apr 19, 2006 13:05:16 + # samt5735(8)$ f90 -V -c dummy.f # f90: Copyright Absoft Corporation 1994-2002; Absoft Pro FORTRAN Version 8.0 # Note that fink installs g77 as f77, so need to use f90 for detection. |