diff options
| author | Michael Hirsch, Ph.D <scivision@users.noreply.github.com> | 2019-04-09 13:40:27 -0400 |
|---|---|---|
| committer | Michael Hirsch, Ph.D <scivision@users.noreply.github.com> | 2019-04-27 23:19:01 -0400 |
| commit | 25fa5d090fab2522082280ea36484bd4ac9e9aa2 (patch) | |
| tree | d6a4baf92649d3d21639298f04149d433d6ca31f /mesonbuild/environment.py | |
| parent | efff0046512744969d7fa000da1dfab3bf29ad63 (diff) | |
| download | meson-25fa5d090fab2522082280ea36484bd4ac9e9aa2.zip meson-25fa5d090fab2522082280ea36484bd4ac9e9aa2.tar.gz meson-25fa5d090fab2522082280ea36484bd4ac9e9aa2.tar.bz2 | |
cleanup C/CXX compiler names, adding Intel like for Fortran
Diffstat (limited to 'mesonbuild/environment.py')
| -rw-r--r-- | mesonbuild/environment.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py index 697b596..57fe4e5 100644 --- a/mesonbuild/environment.py +++ b/mesonbuild/environment.py @@ -453,12 +453,13 @@ class Environment: # List of potential compilers. if mesonlib.is_windows(): - self.default_c = ['cl', 'cc', 'gcc', 'clang', 'clang-cl', 'pgcc'] + # Intel C and C++ compiler is icl on Windows, but icc and icpc elsewhere. + self.default_c = ['cl', 'cc', 'gcc', 'clang', 'clang-cl', 'pgcc', 'icl'] # There is currently no pgc++ for Windows, only for Mac and Linux. - self.default_cpp = ['cl', 'c++', 'g++', 'clang++', 'clang-cl'] + self.default_cpp = ['cl', 'c++', 'g++', 'clang++', 'clang-cl', 'icl'] else: - self.default_c = ['cc', 'gcc', 'clang', 'pgcc'] - self.default_cpp = ['c++', 'g++', 'clang++', 'pgc++'] + self.default_c = ['cc', 'gcc', 'clang', 'pgcc', 'icc'] + self.default_cpp = ['c++', 'g++', 'clang++', 'pgc++', 'icpc'] if mesonlib.is_windows(): self.default_cs = ['csc', 'mcs'] else: |