diff options
| author | tim cera <tcera@sjrwmd.com> | 2011-10-20 15:47:05 -0400 |
|---|---|---|
| committer | Charles Harris <charlesr.harris@gmail.com> | 2011-10-23 10:06:45 -0600 |
| commit | 31c29026bdde0735aceeebeb2e050f0c52fb1146 (patch) | |
| tree | 4e613eb0cc75f5bb3a76e45f7ed13abae9436512 /numpy/distutils/fcompiler | |
| parent | ec56ee1c4ef750c9db7b2ab6ab4bf1658971a070 (diff) | |
| download | numpy-31c29026bdde0735aceeebeb2e050f0c52fb1146.tar.gz | |
ENH: Add 'pgfortran' as a valid compiler in the Portland Group
suite of fortran compilers. Adjust the version string command.
Diffstat (limited to 'numpy/distutils/fcompiler')
| -rw-r--r-- | numpy/distutils/fcompiler/pg.py | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/numpy/distutils/fcompiler/pg.py b/numpy/distutils/fcompiler/pg.py index a34669c36..6ea3c03d6 100644 --- a/numpy/distutils/fcompiler/pg.py +++ b/numpy/distutils/fcompiler/pg.py @@ -10,14 +10,14 @@ class PGroupFCompiler(FCompiler): compiler_type = 'pg' description = 'Portland Group Fortran Compiler' - version_pattern = r'\s*pg(f77|f90|hpf) (?P<version>[\d.-]+).*' + version_pattern = r'\s*pg(f77|f90|hpf|fortran) (?P<version>[\d.-]+).*' if platform == 'darwin': executables = { - 'version_cmd' : ["<F77>", "-V 2>/dev/null"], - 'compiler_f77' : ["pgf77", "-dynamiclib"], - 'compiler_fix' : ["pgf90", "-Mfixed", "-dynamiclib"], - 'compiler_f90' : ["pgf90", "-dynamiclib"], + 'version_cmd' : ["<F77>", "-V"], + 'compiler_f77' : ["pgfortran", "-dynamiclib"], + 'compiler_fix' : ["pgfortran", "-Mfixed", "-dynamiclib"], + 'compiler_f90' : ["pgfortran", "-dynamiclib"], 'linker_so' : ["libtool"], 'archiver' : ["ar", "-cr"], 'ranlib' : ["ranlib"] @@ -25,11 +25,11 @@ class PGroupFCompiler(FCompiler): pic_flags = [''] else: executables = { - 'version_cmd' : ["<F77>", "-V 2>/dev/null"], - 'compiler_f77' : ["pgf77"], - 'compiler_fix' : ["pgf90", "-Mfixed"], - 'compiler_f90' : ["pgf90"], - 'linker_so' : ["pgf90","-shared","-fpic"], + 'version_cmd' : ["<F77>", "-V"], + 'compiler_f77' : ["pgfortran"], + 'compiler_fix' : ["pgfortran", "-Mfixed"], + 'compiler_f90' : ["pgfortran"], + 'linker_so' : ["pgfortran","-shared","-fpic"], 'archiver' : ["ar", "-cr"], 'ranlib' : ["ranlib"] } |