diff options
Diffstat (limited to 'scipy_distutils/sunfcompiler.py')
| -rw-r--r-- | scipy_distutils/sunfcompiler.py | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/scipy_distutils/sunfcompiler.py b/scipy_distutils/sunfcompiler.py index 96e011fd1..38efd77a0 100644 --- a/scipy_distutils/sunfcompiler.py +++ b/scipy_distutils/sunfcompiler.py @@ -7,11 +7,11 @@ from fcompiler import FCompiler class SunFCompiler(FCompiler): compiler_type = 'sun' - version_pattern = r'(f90|f95): (Sun|Forte Developer 7) Fortran 95 (?P<version>[^\s]+).*' + version_pattern = r'(f90|f95): (Sun|Forte Developer 7|WorkShop 6 update \d+) Fortran 95 (?P<version>[^\s]+).*' executables = { 'version_cmd' : ["f90", "-V"], - 'compiler_f77' : ["f90", "-f77", "-ftrap=%none"], + 'compiler_f77' : ["f90"], 'compiler_fix' : ["f90", "-fixed"], 'compiler_f90' : ["f90"], 'linker_so' : ["f90","-Bdynamic","-G"], @@ -22,6 +22,13 @@ class SunFCompiler(FCompiler): module_include_switch = '-M' pic_flags = ['-xcode=pic32'] + def get_flags_f77(self): + ret = ["-ftrap=%none"] + if (self.get_version() or '') >= '7': + ret.append("-f77") + else: + ret.append("-fixed") + return ret def get_opt(self): return ['-fast','-dalign'] def get_arch(self): |