diff options
author | Dylan Baker <dylan@pnwbakers.com> | 2019-08-19 14:57:31 -0700 |
---|---|---|
committer | Dylan Baker <dylan@pnwbakers.com> | 2019-09-09 21:22:26 -0700 |
commit | 52aba19b17a10c7edbef05f8dc86aa917b59f5c3 (patch) | |
tree | aafcca6902e15bb9ce6212708ebaf536aa3d1df8 | |
parent | e5a67b42481f55295edc82f398509d760f07d4ce (diff) | |
download | meson-52aba19b17a10c7edbef05f8dc86aa917b59f5c3.zip meson-52aba19b17a10c7edbef05f8dc86aa917b59f5c3.tar.gz meson-52aba19b17a10c7edbef05f8dc86aa917b59f5c3.tar.bz2 |
environment: gcc/g++ and clang/clang++ are valid objc/objc++ compilers to try
-rw-r--r-- | mesonbuild/environment.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py index aefa807..6236527 100644 --- a/mesonbuild/environment.py +++ b/mesonbuild/environment.py @@ -499,16 +499,19 @@ class Environment: # There is currently no pgc++ for Windows, only for Mac and Linux. self.default_cpp = ['icl', 'cl', 'c++', 'g++', 'clang++', 'clang-cl'] self.default_fortran = ['ifort', 'gfortran', 'flang', 'pgfortran', 'g95'] + # Clang and clang++ are valid, but currently unsupported. + self.default_objc = ['cc', 'gcc'] + self.default_objcpp = ['c++', 'g++'] else: self.default_c = ['cc', 'gcc', 'clang', 'pgcc', 'icc'] self.default_cpp = ['c++', 'g++', 'clang++', 'pgc++', 'icpc'] self.default_fortran = ['gfortran', 'flang', 'pgfortran', 'ifort', 'g95'] + self.default_objc = ['cc', 'gcc', 'clang'] + self.default_objcpp = ['c++', 'g++', 'clang++'] if mesonlib.is_windows(): self.default_cs = ['csc', 'mcs'] else: self.default_cs = ['mcs', 'csc'] - self.default_objc = ['cc'] - self.default_objcpp = ['c++'] self.default_d = ['ldc2', 'ldc', 'gdc', 'dmd'] self.default_java = ['javac'] self.default_cuda = ['nvcc'] |