aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild/compilers/compilers.py
diff options
context:
space:
mode:
authorNirbheek Chauhan <nirbheek@centricular.com>2017-12-30 06:19:31 +0530
committerJussi Pakkanen <jpakkane@gmail.com>2017-12-30 17:59:34 +0200
commit6f3e2a0a0753ad0a4fc84a74fdc6209f436d4371 (patch)
tree826ba710421b6d26b259e3627456622026bd77f0 /mesonbuild/compilers/compilers.py
parent2c1b45b2b22b8609f08265db2446323cd0a27fc0 (diff)
downloadmeson-6f3e2a0a0753ad0a4fc84a74fdc6209f436d4371.zip
meson-6f3e2a0a0753ad0a4fc84a74fdc6209f436d4371.tar.gz
meson-6f3e2a0a0753ad0a4fc84a74fdc6209f436d4371.tar.bz2
compilers: prefer C++ over objc in clink_langs
Otherwise we will try to use the objc compiler when linking projects with both objc and C++. Technically we should use the objc++ linker when doing this, but on most (all?) systems the objc++ linker is `c++`, which is the same as the C++ linker. Closes https://github.com/mesonbuild/meson/issues/2468
Diffstat (limited to 'mesonbuild/compilers/compilers.py')
-rw-r--r--mesonbuild/compilers/compilers.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/mesonbuild/compilers/compilers.py b/mesonbuild/compilers/compilers.py
index 24ae3c9..9728918 100644
--- a/mesonbuild/compilers/compilers.py
+++ b/mesonbuild/compilers/compilers.py
@@ -49,7 +49,7 @@ cpp_suffixes = lang_suffixes['cpp'] + ('h',)
c_suffixes = lang_suffixes['c'] + ('h',)
# List of languages that can be linked with C code directly by the linker
# used in build.py:process_compilers() and build.py:get_dynamic_linker()
-clike_langs = ('objcpp', 'objc', 'd', 'cpp', 'c', 'fortran',)
+clike_langs = ('d', 'objcpp', 'cpp', 'objc', 'c', 'fortran',)
clike_suffixes = ()
for _l in clike_langs:
clike_suffixes += lang_suffixes[_l]