diff --git a/cerbero/build/build.py b/cerbero/build/build.py
index d201323e1..66dbbafbb 100644
--- a/cerbero/build/build.py
+++ b/cerbero/build/build.py
@@ -733,8 +733,9 @@ def _write_meson_cross_file(self):
         # Operate on a copy of the recipe properties to avoid accumulating args
         # from all archs when doing universal builds
         cross_properties = copy.deepcopy(self.meson_cross_properties)
-        for args in ('c_args', 'cpp_args', 'objc_args', 'c_link_args',
-                     'cpp_link_args', 'objc_link_args', 'objcpp_link_args'):
+        for args in ('c_args', 'cpp_args', 'objc_args', 'objcpp_args',
+                     'c_link_args', 'cpp_link_args', 'objc_link_args',
+                     'objcpp_link_args'):
             if args in cross_properties:
                 cross_properties[args] += locals()[args]
             else:
diff --git a/config/darwin.config b/config/darwin.config
index 26aed5e49..ecfc90598 100644
--- a/config/darwin.config
+++ b/config/darwin.config
@@ -93,6 +93,7 @@ os.environ['OBJCOPY'] = 'objcopy'
 os.environ['CC'] = 'clang'
 os.environ['OBJC'] = 'clang'
 os.environ['CXX'] = 'clang++'
+os.environ['OBJCXX'] = 'clang++'
 # Since 10.10 libstdc++ is deprecated, and might no longer be
 # shipped. Make sure we use libc++ instead
 os.environ['CXXFLAGS'] += ' -stdlib=libc++ '
diff --git a/config/ios.config b/config/ios.config
index 54734a69b..4ea39570f 100644
--- a/config/ios.config
+++ b/config/ios.config
@@ -101,6 +101,7 @@ extra_cflags += ' -Wno-error=format-nonliteral -Wno-error=implicit-function-decl
 
 os.environ['PATH'] = '%s:%s' % (toolchain_path, os.environ['PATH'])
 os.environ['OBJC'] = os.environ['CC']
+os.environ['OBJCXX'] = os.environ['CXX']
 os.environ['CPP']= "%s -E" % os.environ['CC']
 os.environ['CXXPP']= os.environ['CPP']
 os.environ['STRIP'] = 'strip'
@@ -124,6 +125,7 @@ os.environ['LDFLAGS'] += extra_ldflags
 os.environ['OBJCFLAGS'] = os.environ['CFLAGS']
 os.environ['OBJLDFLAGS'] = os.environ['LDFLAGS']
 os.environ['CXXFLAGS'] =' -stdlib=libc++ ' +  os.environ['CFLAGS']
+os.environ['OBJCXXFLAGS'] =' -stdlib=libc++ ' +  os.environ['CFLAGS']
 
 os.environ['AS']= 'as'
 if target_arch in [Architecture.X86, Architecture.X86_64]: