Fix Objective C/C++.

mesonbuild/backend/ninjabackend.py

@@ -2800,11 +2800,10 @@ def get_link_debugfile_args(self, linker: T.Union[Compiler, StaticLinker], targe
         return []
 
     def generate_llvm_ir_compile(self, target, src: FileOrString):
-        base_proxy = target.get_options()
         compiler = get_compiler_for_source(target.compilers.values(), src)
         commands = compiler.compiler_args()
         # Compiler args for compiling this target
-        commands += compilers.get_base_compile_args(base_proxy, compiler, self.environment)
+        commands += compilers.get_base_compile_args(target, compiler, self.environment)
         if isinstance(src, File):
             if src.is_built:
                 src_filename = os.path.join(src.subdir, src.fname)

mesonbuild/compilers/c.py

@@ -7,6 +7,7 @@
 import typing as T
 
 from .. import options
+from ..options import OptionKey
 from .. import mlog
 from ..mesonlib import MesonException, version_compare
 from .c_function_attributes import C_FUNC_ATTRIBUTES
@@ -322,7 +323,7 @@ def get_options(self) -> 'MutableKeyedOptionDictType':
 
     def get_option_compile_args(self, target: 'BuildTarget', env: 'Environment', subproject=None) -> T.List[str]:
         args = []
-        key = self.form_compileropt_key('std')
+        key = OptionKey('c_std', machine=self.for_machine)
         if target:
             std = env.coredata.get_option_for_target(target, key)
         else:

mesonbuild/compilers/compilers.py

@@ -417,7 +417,7 @@ def get_base_link_args(target: 'BuildTarget',
     bitcode = option_enabled(linker.base_options, target, env, 'b_bitcode')
     # Shared modules cannot be built with bitcode_bundle because
     # -bitcode_bundle is incompatible with -undefined and -bundle
-    if bitcode and not is_shared_module:
+    if bitcode and not target.typename == 'shared module':
         args.extend(linker.bitcode_args())
     elif as_needed:
         # -Wl,-dead_strip_dylibs is incompatible with bitcode

mesonbuild/compilers/cpp.py

@@ -297,7 +297,7 @@ def get_option_compile_args(self, target: 'BuildTarget', env: 'Environment', sub
         if std != 'none':
             args.append(self._find_best_cpp_std(std))
 
-        non_msvc_eh_options(env.determine_option_value(key.evolve('eh'), target, subproject), args)
+        non_msvc_eh_options(eh, args)
 
         if debugstl:
             args.append('-D_GLIBCXX_DEBUG=1')

mesonbuild/compilers/objc.py

@@ -88,9 +88,13 @@ def get_options(self) -> 'coredata.MutableKeyedOptionDictType':
                                'none'),
         )
 
-    def get_option_compile_args(self, options: 'coredata.KeyedOptionDictType') -> T.List[str]:
+    def get_option_compile_args(self, target: 'BuildTarget', env: 'Environment', subproject=None) -> T.List[str]:
         args = []
-        std = options.get_value(OptionKey('c_std', machine=self.for_machine))
+        key = OptionKey('c_std', machine=self.for_machine)
+        if target:
+            std = env.coredata.get_option_for_target(target, key)
+        else:
+            std = env.coredata.get_option_for_subproject(key, subproject)
         if std != 'none':
             args.append('-std=' + std)
         return args

mesonbuild/compilers/objcpp.py

@@ -90,9 +90,13 @@ def get_options(self) -> coredata.MutableKeyedOptionDictType:
                                'none'),
         )
 
-    def get_option_compile_args(self, options: 'coredata.KeyedOptionDictType') -> T.List[str]:
+    def get_option_compile_args(self, target: 'BuildTarget', env: 'Environment', subproject=None) -> T.List[str]:
         args = []
-        std = options.get_value(OptionKey('cpp_std', machine=self.for_machine))
+        key = OptionKey('cpp_std', machine=self.for_machine)
+        if target:
+            std = env.coredata.get_option_for_target(target, key)
+        else:
+            std = env.coredata.get_option_for_subproject(key, subproject)
         if std != 'none':
             args.append('-std=' + std)
         return args

mesonbuild/coredata.py

@@ -728,8 +728,15 @@ def add_compiler_options(self, c_options: MutableKeyedOptionDictType, lang: str,
                     # FIXME, add augment
                     #self.optstore[k] = o  # override compiler option on reconfigure
                     pass
+
             comp_key = OptionKey(f'{k.name}', None, for_machine)
-            self.optstore.add_compiler_option(lang, comp_key, o)
+            if lang == 'objc' and k.name == 'c_std':
+                # For objective C, always fall back to c_std.
+                self.optstore.add_compiler_option('c', comp_key, o)
+            elif lang == 'objcpp' and k.name == 'cpp_std':
+                self.optstore.add_compiler_option('cpp', comp_key, o)
+            else:
+                self.optstore.add_compiler_option(lang, comp_key, o)
 
 #            if subproject:
 #                sk = k.evolve(subproject=subproject)