From 249c22df004e971bdc3d4121f526358e7552591e Mon Sep 17 00:00:00 2001 From: Dylan Baker Date: Thu, 13 Nov 2025 09:37:58 -0800 Subject: compilers: Remove Environment parameter from Compiler.get_option_std_args --- mesonbuild/backend/backends.py | 2 +- mesonbuild/backend/ninjabackend.py | 2 +- mesonbuild/backend/vs2010backend.py | 2 +- mesonbuild/backend/xcodebackend.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'mesonbuild/backend') diff --git a/mesonbuild/backend/backends.py b/mesonbuild/backend/backends.py index 446e15e8a..bf29e5306 100644 --- a/mesonbuild/backend/backends.py +++ b/mesonbuild/backend/backends.py @@ -939,7 +939,7 @@ class Backend: # Add compile args for c_* or cpp_* build options set on the # command-line or default_options inside project(). commands += compiler.get_option_compile_args(target, self.environment, target.subproject) - commands += compiler.get_option_std_args(target, self.environment, target.subproject) + commands += compiler.get_option_std_args(target, target.subproject) optimization = self.get_target_option(target, 'optimization') assert isinstance(optimization, str), 'for mypy' diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py index 3ef5f6267..bd4f86099 100644 --- a/mesonbuild/backend/ninjabackend.py +++ b/mesonbuild/backend/ninjabackend.py @@ -1829,7 +1829,7 @@ class NinjaBackend(backends.Backend): args += cython.get_debug_args(self.get_target_option(target, 'debug')) args += cython.get_optimization_args(self.get_target_option(target, 'optimization')) args += cython.get_option_compile_args(target, self.environment, target.subproject) - args += cython.get_option_std_args(target, self.environment, target.subproject) + args += cython.get_option_std_args(target, target.subproject) args += self.build.get_global_args(cython, target.for_machine) args += self.build.get_project_args(cython, target.subproject, target.for_machine) args += target.get_extra_args('cython') diff --git a/mesonbuild/backend/vs2010backend.py b/mesonbuild/backend/vs2010backend.py index 8188b1826..98efa1fe5 100644 --- a/mesonbuild/backend/vs2010backend.py +++ b/mesonbuild/backend/vs2010backend.py @@ -1034,7 +1034,7 @@ class Vs2010Backend(backends.Backend): file_args[l] += comp.get_option_compile_args( target, self.environment, target.subproject) file_args[l] += comp.get_option_std_args( - target, self.environment, target.subproject) + target, target.subproject) # Add compile args added using add_project_arguments() for l, args in self.build.projects_args[target.for_machine].get(target.subproject, {}).items(): diff --git a/mesonbuild/backend/xcodebackend.py b/mesonbuild/backend/xcodebackend.py index 95a62a02a..f07c1982d 100644 --- a/mesonbuild/backend/xcodebackend.py +++ b/mesonbuild/backend/xcodebackend.py @@ -1744,7 +1744,7 @@ class XCodeBackend(backends.Backend): # Start with warning args warn_args = compiler.get_warn_args(self.get_target_option(target, 'warning_level')) std_args = compiler.get_option_compile_args(target, self.environment, target.subproject) - std_args += compiler.get_option_std_args(target, self.environment, target.subproject) + std_args += compiler.get_option_std_args(target, target.subproject) # Add compile args added using add_project_arguments() pargs = self.build.projects_args[target.for_machine].get(target.subproject, {}).get(lang, []) # Add compile args added using add_global_arguments() -- cgit v1.3