Virtualization
/
meson
mirror of https://gitlab.com/qemu-project/meson.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

ObjC/ObjC++ compilers are not available for Elbrus, so don't fail

This commit is contained in:
makise-homura 2020-01-13 17:20:07 +03:00
parent ca1f7726d5
commit 7ca53e40a3
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
mesonbuild/environment.py
View File

@ -586,11 +586,19 @@ class Environment:
self.default_objcpp = ['c++', 'g++']
self.default_cs = ['csc', 'mcs']
else:
self.default_c = ['cc', 'gcc', 'clang', 'pgcc', 'icc']
self.default_cpp = ['c++', 'g++', 'clang++', 'pgc++', 'icpc']
if platform.machine().lower() == 'e2k':
# There are no objc or objc++ compilers for Elbrus,
# and there's no clang which can build binaries for host.
self.default_c = ['cc', 'gcc', 'lcc']
self.default_cpp = ['c++', 'g++', 'l++']
self.default_objc = []
self.default_objcpp = []
else:
self.default_c = ['cc', 'gcc', 'clang', 'pgcc', 'icc']
self.default_cpp = ['c++', 'g++', 'clang++', 'pgc++', 'icpc']
self.default_objc = ['cc', 'gcc', 'clang']
self.default_objcpp = ['c++', 'g++', 'clang++']
self.default_fortran = ['gfortran', 'flang', 'pgfortran', 'ifort', 'g95']
self.default_objc = ['cc', 'gcc', 'clang']
self.default_objcpp = ['c++', 'g++', 'clang++']
self.default_cs = ['mcs', 'csc']
self.default_d = ['ldc2', 'ldc', 'gdc', 'dmd']
self.default_java = ['javac']
@ -1265,7 +1273,7 @@ class Environment:
popen_exceptions[' '.join(compiler + arg)] = e
continue
version = search_version(out)
if 'Free Software Foundation' in out or ('e2k' in out and 'lcc' in out):
if 'Free Software Foundation' in out:
defines = self.get_gnu_compiler_defines(compiler)
if not defines:
popen_exceptions[' '.join(compiler)] = 'no pre-processor defines'

2
run_unittests.py
View File

@ -2290,7 +2290,7 @@ class AllPlatformTests(BasePlatformTests):
ar = mesonbuild.linkers.ArLinker
lib = mesonbuild.linkers.VisualStudioLinker
langs = [('c', 'CC'), ('cpp', 'CXX')]
if not is_windows():
if not is_windows() and platform.machine().lower() != 'e2k':
langs += [('objc', 'OBJC'), ('objcpp', 'OBJCXX')]
testdir = os.path.join(self.unit_test_dir, '5 compiler detection')
env = get_fake_env(testdir, self.builddir, self.prefix)