diff options
| -rw-r--r-- | mesonbuild/compilers.py | 1 | ||||
| -rw-r--r-- | mesonbuild/environment.py | 26 |
2 files changed, 13 insertions, 14 deletions
diff --git a/mesonbuild/compilers.py b/mesonbuild/compilers.py index ac5cdf5c8..e87f9741f 100644 --- a/mesonbuild/compilers.py +++ b/mesonbuild/compilers.py @@ -484,7 +484,6 @@ int someSymbolHereJustForFun; return p.returncode == 0 def links(self, code, extra_args = []): - suflen = len(self.default_suffix) (fd, srcname) = tempfile.mkstemp(suffix='.'+self.default_suffix) os.close(fd) (fd, dstname) = tempfile.mkstemp() diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py index 6d217f217..df848f877 100644 --- a/mesonbuild/environment.py +++ b/mesonbuild/environment.py @@ -266,32 +266,32 @@ class Environment(): version = vmatch.group(0) if 'GNU Fortran' in out: - return GnuFortranCompiler([compiler], version, GCC_STANDARD, is_cross, exe_wrap) + return GnuFortranCompiler([compiler], version, GCC_STANDARD, is_cross, exe_wrap) if 'G95' in out: - return G95FortranCompiler([compiler], version, is_cross, exe_wrap) + return G95FortranCompiler([compiler], version, is_cross, exe_wrap) if 'Sun Fortran' in err: - version = 'unknown version' - vmatch = re.search(Environment.version_regex, err) - if vmatch: - version = vmatch.group(0) - return SunFortranCompiler([compiler], version, is_cross, exe_wrap) + version = 'unknown version' + vmatch = re.search(Environment.version_regex, err) + if vmatch: + version = vmatch.group(0) + return SunFortranCompiler([compiler], version, is_cross, exe_wrap) if 'ifort (IFORT)' in out: - return IntelFortranCompiler([compiler], version, is_cross, exe_wrap) - + return IntelFortranCompiler([compiler], version, is_cross, exe_wrap) + if 'PathScale EKOPath(tm)' in err: - return PathScaleFortranCompiler([compiler], version, is_cross, exe_wrap) + return PathScaleFortranCompiler([compiler], version, is_cross, exe_wrap) if 'pgf90' in out: - return PGIFortranCompiler([compiler], version, is_cross, exe_wrap) + return PGIFortranCompiler([compiler], version, is_cross, exe_wrap) if 'Open64 Compiler Suite' in err: - return Open64FortranCompiler([compiler], version, is_cross, exe_wrap) + return Open64FortranCompiler([compiler], version, is_cross, exe_wrap) if 'NAG Fortran' in err: - return NAGFortranCompiler([compiler], version, is_cross, exe_wrap) + return NAGFortranCompiler([compiler], version, is_cross, exe_wrap) raise EnvironmentException('Unknown compiler(s): "' + ', '.join(compilers) + '"') |