aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2021-04-24 19:46:36 +0300
committerJussi Pakkanen <jpakkane@gmail.com>2021-04-24 19:46:36 +0300
commitd816b8365e85bd65e940b118aa853a177f275f04 (patch)
treeae7932c17561623445aa81829fe295959fe6a4a5
parent9388af0a05d286875a75487c960177593cc0bf40 (diff)
downloadmeson-d816b8365e85bd65e940b118aa853a177f275f04.zip
meson-d816b8365e85bd65e940b118aa853a177f275f04.tar.gz
meson-d816b8365e85bd65e940b118aa853a177f275f04.tar.bz2
Xcode: add objective C++ flags to plain C++ because Xcode requires it.
-rw-r--r--mesonbuild/backend/xcodebackend.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/mesonbuild/backend/xcodebackend.py b/mesonbuild/backend/xcodebackend.py
index ff0bae7..6fc4729 100644
--- a/mesonbuild/backend/xcodebackend.py
+++ b/mesonbuild/backend/xcodebackend.py
@@ -1452,9 +1452,11 @@ class XCodeBackend(backends.Backend):
# This may break reproducible builds, in which case patches are welcome.
lang_cargs += self.get_custom_target_dir_include_args(target, compiler, absolute_path=True)
# Xcode can not handle separate compilation flags for C and ObjectiveC. They are both
- # put in OTHER_CFLAGS.
+ # put in OTHER_CFLAGS. Same with C++ and ObjectiveC++.
if lang == 'objc':
lang = 'c'
+ elif lang == 'objcpp':
+ lang = 'cpp'
langname = LANGNAMEMAP[lang]
if langname in langargs:
langargs[langname] += args