compilers: Use get_option_for_maybe_target

Author: dcbaker

mesonbuild/compilers/cpp.py

@@ -808,13 +808,9 @@ def get_option_link_args(self, target: None, subproject: SubProject) -> T.List[s
 
     def get_option_link_args(self, target: T.Optional[BuildTarget], subproject: T.Optional[SubProject] = None) -> T.List[str]:
         subproject = subproject if subproject is not None else target.subproject
-        # need a typeddict for this
         key = self.form_compileropt_key('winlibs', subproject)
-        if target:
-            value = self.environment.coredata.optstore.get_option_for_target_untyped(target, key)
-        else:
-            value = self.environment.coredata.optstore.get_value_for_untyped(key)
-        return T.cast('T.List[str]', value)[:]
+        value = self.environment.coredata.optstore.get_option_for_maybe_target(target, key, list)
+        return value.copy()
 
     def _get_options_impl(self, opts: 'MutableKeyedOptionDictType', cpp_stds: T.List[str]) -> 'MutableKeyedOptionDictType':
         opts = super().get_options()
@@ -922,10 +918,7 @@ def get_option_std_args(self, target: T.Optional[BuildTarget], subproject: T.Opt
         # (i.e., after VS2015U3)
         # if one is using anything before that point, one cannot set the standard.
         stdkey = self.form_compileropt_key('std', subproject)
-        if target is not None:
-            std = self.environment.coredata.optstore.get_option_for_target_untyped(target, stdkey)
-        else:
-            std = self.environment.coredata.optstore.get_value_for_untyped(stdkey)
+        std = self.environment.coredata.optstore.get_option_for_maybe_target(target, stdkey, str)
         if std in {'vc++11', 'c++11'}:
             mlog.warning(self.id, 'does not support C++11;',
                          'attempting best effort; setting the standard to C++14',

mesonbuild/compilers/cuda.py

@@ -778,14 +778,11 @@ def _get_ccbin_args(self, target: 'T.Optional[BuildTarget]',
                         subproject: T.Optional[SubProject] = None) -> T.List[str]:
         subproject = target.subproject if subproject is None else subproject
         key = self.form_compileropt_key('ccbindir', subproject)
-        if target:
-            ccbindir = self.environment.coredata.optstore.get_option_for_target_untyped(target, key)
-        else:
-            ccbindir = self.environment.coredata.optstore.get_value_for_untyped(key)
-        if isinstance(ccbindir, str) and ccbindir != '':
+        ccbindir = self.environment.coredata.optstore.get_option_for_maybe_target(target, key, str)
+
+        if ccbindir != '':
             return [self._shield_nvcc_list_arg('-ccbin='+ccbindir, False)]
-        else:
-            return []
+        return []
 
     def get_profile_generate_args(self) -> T.List[str]:
         return ['-Xcompiler=' + x for x in self.host_compiler.get_profile_generate_args()]

mesonbuild/compilers/mixins/elbrus.py

@@ -87,11 +87,7 @@ def get_option_std_args(self, target: T.Optional[BuildTarget], subproject: T.Opt
         args: T.List[str] = []
         subproject = subproject if subproject is not None else target.subproject
         key = OptionKey(f'{self.language}_std', subproject=subproject, machine=self.for_machine)
-        if target:
-            std = self.environment.coredata.optstore.get_option_for_target_untyped(target, key)
-        else:
-            std = self.environment.coredata.optstore.get_value_for_untyped(key)
-        assert isinstance(std, str)
+        std = self.environment.coredata.optstore.get_option_for_maybe_target(target, key, str)
         if std != 'none':
             args.append('-std=' + std)
         return args

mesonbuild/compilers/objc.py

@@ -79,11 +79,7 @@ def get_option_std_args(self, target: T.Optional[BuildTarget], subproject: T.Opt
         args: T.List[str] = []
         subproject = subproject if subproject is not None else target.subproject
         key = OptionKey('c_std', subproject=subproject, machine=self.for_machine)
-        if target:
-            std = self.environment.coredata.optstore.get_option_for_target_untyped(target, key)
-        else:
-            std = self.environment.coredata.optstore.get_value_for_untyped(key)
-        assert isinstance(std, str)
+        std = self.environment.coredata.optstore.get_option_for_maybe_target(target, key, str)
         if std != 'none':
             args.append('-std=' + std)
         return args

mesonbuild/compilers/objcpp.py

@@ -83,11 +83,7 @@ def get_option_std_args(self, target: T.Optional[BuildTarget], subproject: T.Opt
         args: T.List[str] = []
         subproject = subproject if subproject is not None else target.subproject
         key = OptionKey('cpp_std', subproject=subproject, machine=self.for_machine)
-        if target:
-            std = self.environment.coredata.optstore.get_option_for_target_untyped(target, key)
-        else:
-            std = self.environment.coredata.optstore.get_value_for_untyped(key)
-        assert isinstance(std, str)
+        std = self.environment.coredata.optstore.get_option_for_maybe_target(target, key, str)
         if std != 'none':
             args.append('-std=' + std)
         return args