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-25 15:35:13 +0300
commit1cd80985b42ea624fa3e7623e3e191a8145e5078 (patch)
treeae7932c17561623445aa81829fe295959fe6a4a5
parent0e4c358f357e23ad4d2f86d6801da2648dbf8ec2 (diff)
downloadmeson-1cd80985b42ea624fa3e7623e3e191a8145e5078.zip
meson-1cd80985b42ea624fa3e7623e3e191a8145e5078.tar.gz
meson-1cd80985b42ea624fa3e7623e3e191a8145e5078.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