diff options
| author | Michael Hirsch, Ph.D <scivision@users.noreply.github.com> | 2019-04-09 13:37:17 -0400 |
|---|---|---|
| committer | Michael Hirsch, Ph.D <scivision@users.noreply.github.com> | 2019-04-27 23:19:00 -0400 |
| commit | 1c70bae952b511b1fc36ef7a3d7c06fe86911d7c (patch) | |
| tree | 727566badbd83a02df7d231a91b4332f9d70c0aa /mesonbuild/environment.py | |
| parent | cbdf9d06471ed9b682e94f5d9f4084ee35358778 (diff) | |
| download | meson-1c70bae952b511b1fc36ef7a3d7c06fe86911d7c.zip meson-1c70bae952b511b1fc36ef7a3d7c06fe86911d7c.tar.gz meson-1c70bae952b511b1fc36ef7a3d7c06fe86911d7c.tar.bz2 | |
order fortran compiler search order more sanely, remove unsupported compiler names
Diffstat (limited to 'mesonbuild/environment.py')
| -rw-r--r-- | mesonbuild/environment.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py index 0c0f00a..fa3d965 100644 --- a/mesonbuild/environment.py +++ b/mesonbuild/environment.py @@ -456,7 +456,8 @@ class Environment: # List of potential compilers. if mesonlib.is_windows(): self.default_c = ['cl', 'cc', 'gcc', 'clang', 'clang-cl', 'pgcc'] - self.default_cpp = ['cl', 'c++', 'g++', 'clang++', 'clang-cl', 'pgc++'] + # There is currently no pgc++ for Windows, only for Mac and Linux. + self.default_cpp = ['cl', 'c++', 'g++', 'clang++', 'clang-cl'] else: self.default_c = ['cc', 'gcc', 'clang', 'pgcc'] self.default_cpp = ['c++', 'g++', 'clang++', 'pgc++'] @@ -467,7 +468,7 @@ class Environment: self.default_objc = ['cc'] self.default_objcpp = ['c++'] self.default_d = ['ldc2', 'ldc', 'gdc', 'dmd'] - self.default_fortran = ['gfortran', 'g95', 'f95', 'f90', 'f77', 'ifort', 'pgfortran'] + self.default_fortran = ['gfortran', 'flang', 'pgfortran', 'ifort', 'g95'] self.default_java = ['javac'] self.default_cuda = ['nvcc'] self.default_rust = ['rustc'] @@ -1039,7 +1040,7 @@ class Environment: # up to date language version at time (2016). if exelist is not None: if os.path.basename(exelist[-1]).startswith(('ldmd', 'gdmd')): - raise EnvironmentException('Meson doesn\'t support %s as it\'s only a DMD frontend for another compiler. Please provide a valid value for DC or unset it so that Meson can resolve the compiler by itself.' % exelist[-1]) + raise EnvironmentException('Meson doesn\'t support %s as it\'s only a DMD frontend for another compiler. Please provide a valid value for DC or unset it so that Meson can resolve the compiler by itself.' % exelist[-1]) else: for d in self.default_d: if shutil.which(d): |