diff options
| author | Dylan Baker <dylan@pnwbakers.com> | 2025-11-13 09:37:58 -0800 |
|---|---|---|
| committer | Dylan Baker <dylan@pnwbakers.com> | 2025-11-19 10:48:48 -0800 |
| commit | 249c22df004e971bdc3d4121f526358e7552591e (patch) | |
| tree | 242700aa239812629553f938ee88008845de1bb6 /mesonbuild/compilers/objc.py | |
| parent | 81bd5d3fe409dd46cad307fbb18703fda1261e38 (diff) | |
| download | meson-249c22df004e971bdc3d4121f526358e7552591e.tar.gz | |
compilers: Remove Environment parameter from Compiler.get_option_std_args
Diffstat (limited to 'mesonbuild/compilers/objc.py')
| -rw-r--r-- | mesonbuild/compilers/objc.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mesonbuild/compilers/objc.py b/mesonbuild/compilers/objc.py index e32b71d60..d62113b1b 100644 --- a/mesonbuild/compilers/objc.py +++ b/mesonbuild/compilers/objc.py @@ -75,13 +75,13 @@ class GnuObjCCompiler(GnuCStds, GnuCompiler, ObjCCompiler): self.supported_warn_args(gnu_common_warning_args) + self.supported_warn_args(gnu_objc_warning_args))} - def get_option_std_args(self, target: BuildTarget, env: Environment, subproject: T.Optional[str] = None) -> T.List[str]: + def get_option_std_args(self, target: BuildTarget, subproject: T.Optional[str] = None) -> T.List[str]: args: T.List[str] = [] key = OptionKey('c_std', subproject=subproject, machine=self.for_machine) if target: - std = env.coredata.get_option_for_target(target, key) + std = self.environment.coredata.get_option_for_target(target, key) else: - std = env.coredata.optstore.get_value_for(key) + std = self.environment.coredata.optstore.get_value_for(key) assert isinstance(std, str) if std != 'none': args.append('-std=' + std) @@ -113,7 +113,7 @@ class ClangObjCCompiler(ClangCStds, ClangCompiler, ObjCCompiler): return 'c_std' return super().make_option_name(key) - def get_option_std_args(self, target: BuildTarget, env: Environment, subproject: T.Optional[str] = None) -> T.List[str]: + def get_option_std_args(self, target: BuildTarget, subproject: T.Optional[str] = None) -> T.List[str]: args = [] key = OptionKey('c_std', machine=self.for_machine) std = self.get_compileropt_value(key, target, subproject) |
