Whitespace fixing.

pull/493/merge
Jussi Pakkanen 9 years ago
parent 4352398caf
commit e0792295bc
  1. 1
      mesonbuild/compilers.py
  2. 26
      mesonbuild/environment.py

@ -484,7 +484,6 @@ int someSymbolHereJustForFun;
return p.returncode == 0 return p.returncode == 0
def links(self, code, extra_args = []): def links(self, code, extra_args = []):
suflen = len(self.default_suffix)
(fd, srcname) = tempfile.mkstemp(suffix='.'+self.default_suffix) (fd, srcname) = tempfile.mkstemp(suffix='.'+self.default_suffix)
os.close(fd) os.close(fd)
(fd, dstname) = tempfile.mkstemp() (fd, dstname) = tempfile.mkstemp()

@ -266,32 +266,32 @@ class Environment():
version = vmatch.group(0) version = vmatch.group(0)
if 'GNU Fortran' in out: 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: 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: if 'Sun Fortran' in err:
version = 'unknown version' version = 'unknown version'
vmatch = re.search(Environment.version_regex, err) vmatch = re.search(Environment.version_regex, err)
if vmatch: if vmatch:
version = vmatch.group(0) version = vmatch.group(0)
return SunFortranCompiler([compiler], version, is_cross, exe_wrap) return SunFortranCompiler([compiler], version, is_cross, exe_wrap)
if 'ifort (IFORT)' in out: 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: 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: 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: 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: 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) + '"') raise EnvironmentException('Unknown compiler(s): "' + ', '.join(compilers) + '"')

Loading…
Cancel
Save