From 0ed2d2719bb275a573ead6ca69be46206daea2bc Mon Sep 17 00:00:00 2001 From: makise-homura Date: Wed, 29 Sep 2021 02:35:53 +0300 Subject: [PATCH] compilers: Select correct clang on e2k for C++ and ObjC++ --- mesonbuild/compilers/detect.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mesonbuild/compilers/detect.py b/mesonbuild/compilers/detect.py index 88da0cc25..f751abedc 100644 --- a/mesonbuild/compilers/detect.py +++ b/mesonbuild/compilers/detect.py @@ -168,9 +168,9 @@ if is_windows(): else: if platform.machine().lower() == 'e2k': defaults['c'] = ['cc', 'gcc', 'lcc', 'clang'] - defaults['cpp'] = ['c++', 'g++', 'l++', 'clang'] + defaults['cpp'] = ['c++', 'g++', 'l++', 'clang++'] defaults['objc'] = ['clang'] - defaults['objcpp'] = ['clang'] + defaults['objcpp'] = ['clang++'] else: defaults['c'] = ['cc', 'gcc', 'clang', 'nvc', 'pgcc', 'icc'] defaults['cpp'] = ['c++', 'g++', 'clang++', 'nvc++', 'pgc++', 'icpc']